aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2009-12-06 17:18:28 +0200
committerJouni Malinen <j@w1.fi>2009-12-06 17:18:28 +0200
commit0bc377fa938c7f70a401a3109adea7fe485a7ef8 (patch)
tree8b4b750a788a5bc24e7a4703672dffb17a9a36a1 /tests
parentab7ddc74ad39ab11de2b3082fc78a3549781aa24 (diff)
downloadexternal_wpa_supplicant_8_ti-0bc377fa938c7f70a401a3109adea7fe485a7ef8.zip
external_wpa_supplicant_8_ti-0bc377fa938c7f70a401a3109adea7fe485a7ef8.tar.gz
external_wpa_supplicant_8_ti-0bc377fa938c7f70a401a3109adea7fe485a7ef8.tar.bz2
Resolve circular library references with --start-group
src/crypto/libcrypto.a and src/tls/libtls.a have circular references and will need special handling with the linker at least for the time being. This could be cleaned up eventually, but for now, provide a mechanism to get the programs linked.
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/Makefile b/tests/Makefile
index b40ff1c..3e46951 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -18,10 +18,14 @@ endif
CFLAGS += -I../src
CFLAGS += -I../src/utils
-LIBS = ../src/utils/libutils.a \
- ../src/crypto/libcrypto.a \
+SLIBS = ../src/utils/libutils.a
+
+DLIBS = ../src/crypto/libcrypto.a \
../src/tls/libtls.a
+LIBS = $(SLIBS) $(DLIBS)
+LLIBS = -Wl,--start-group $(DLIBS) -Wl,--end-group $(SLIBS)
+
../src/utils/libutils.a:
$(MAKE) -C ../src/utils
@@ -60,7 +64,7 @@ test-sha256: test-sha256.o $(LIBS)
$(LDO) $(LDFLAGS) -o $@ $^
test-x509: test-x509.o $(LIBS)
- $(LDO) $(LDFLAGS) -o $@ $^
+ $(LDO) $(LDFLAGS) -o $@ $< $(LLIBS)
run-tests: $(TESTS)