From 7f7aebca023acef6840ca5cd91554c5ba7ee83e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Fri, 13 Mar 2015 17:15:49 +0000 Subject: [PATCH] Fix incomplete changes from merge --- programs/Makefile | 6 +++--- tests/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/Makefile b/programs/Makefile index 2d4b12bf9..2832c71d2 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -187,11 +187,11 @@ random/gen_random_ctr_drbg$(EXEXT): random/gen_random_ctr_drbg.c ../library/libm ssl/dtls_client$(EXEXT): ssl/dtls_client.c ../library/libmbedtls.a echo " CC ssl/dtls_client.c" - $(CC) $(CFLAGS) $(OFLAGS) ssl/dtls_client.c $(LDFLAGS) -o $@ + $(CC) $(LOCAL_CFLAGS) $(CFLAGS) $(OFLAGS) ssl/dtls_client.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ ssl/dtls_server$(EXEXT): ssl/dtls_server.c ../library/libmbedtls.a echo " CC ssl/dtls_server.c" - $(CC) $(CFLAGS) $(OFLAGS) ssl/dtls_server.c $(LDFLAGS) -o $@ + $(CC) $(LOCAL_CFLAGS) $(CFLAGS) $(OFLAGS) ssl/dtls_server.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ ssl/ssl_client1$(EXEXT): ssl/ssl_client1.c ../library/libmbedtls.a echo " CC ssl/ssl_client1.c" @@ -239,7 +239,7 @@ test/selftest$(EXEXT): test/selftest.c ../library/libmbedtls.a test/udp_proxy$(EXEXT): test/udp_proxy.c ../library/libmbedtls.a echo " CC test/udp_proxy.c" - $(CC) $(CFLAGS) $(OFLAGS) test/udp_proxy.c $(LOCAL_LDFLAGS)$(LDFLAGS) -o $@ + $(CC) $(LOCAL_CFLAGS) $(CFLAGS) $(OFLAGS) test/udp_proxy.c $(LOCAL_LDFLAGS)$(LDFLAGS) -o $@ util/pem2der$(EXEXT): util/pem2der.c ../library/libmbedtls.a echo " CC util/pem2der.c" diff --git a/tests/Makefile b/tests/Makefile index e14e56174..5b2c3a84b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -398,7 +398,7 @@ test_suite_shax$(EXEXT): test_suite_shax.c $(DEP) test_suite_ssl$(EXEXT): test_suite_ssl.c $(DEP) echo " CC $<" - $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@ + $(CC) $(LOCAL_CFLAGS) $(CFLAGS) $< $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ test_suite_x509parse$(EXEXT): test_suite_x509parse.c $(DEP) echo " CC $<"