aboutsummaryrefslogtreecommitdiff
path: root/tests.mk
diff options
context:
space:
mode:
authorJacob Marble <jacobmarble@google.com>2016-01-12 16:34:39 -0800
committerJacob Marble <jacobmarble@google.com>2016-01-13 00:56:07 +0000
commitf1ac1d45ebc33a6d61bb5e3041d7d403bac56fb6 (patch)
tree77f788bef06009a855412ddbe5b5129a4988af65 /tests.mk
parent72799d78240d9c1aa965f2ee2a7470c75d76b04f (diff)
downloadlibweave-f1ac1d45ebc33a6d61bb5e3041d7d403bac56fb6.tar.gz
libweave: Add clang support to Makefile.
To use: "CLANG=1 make all -j" BUG: 26508278 Change-Id: I6b09e6574634d8e07ce2438c31907466e953eb0f Reviewed-on: https://weave-review.googlesource.com/2185 Reviewed-by: Vitaly Buka <vitalybuka@google.com>
Diffstat (limited to 'tests.mk')
-rw-r--r--tests.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests.mk b/tests.mk
index 64fc622..aa9ee53 100644
--- a/tests.mk
+++ b/tests.mk
@@ -23,7 +23,7 @@ $(weave_unittest_obj_files) : out/$(BUILD_MODE)/%.o : %.cc third_party/lib/libgt
$(CXX) $(DEFS_$(BUILD_MODE)) $(INCLUDES) $(CFLAGS) $(CFLAGS_$(BUILD_MODE)) $(CFLAGS_CC) -c -o $@ $<
out/$(BUILD_MODE)/libweave_testrunner : $(weave_unittest_obj_files) $(third_party_chromium_crypto_unittest_obj_files) $(third_party_chromium_base_unittest_obj_files) out/$(BUILD_MODE)/libweave_common.a out/$(BUILD_MODE)/libweave-test.a
- $(CXX) -o $@ $^ -lcrypto -lexpat -lgmock -lgtest -lpthread -lrt -Lthird_party/lib
+ $(CXX) -o $@ $^ $(CFLAGS) -lcrypto -lexpat -lgmock -lgtest -lpthread -lrt -Lthird_party/lib
test : out/$(BUILD_MODE)/libweave_testrunner
$<
@@ -39,7 +39,7 @@ $(weave_exports_unittest_obj_files) : out/$(BUILD_MODE)/%.o : %.cc third_party/l
$(CXX) $(DEFS_$(BUILD_MODE)) $(INCLUDES) $(CFLAGS) $(CFLAGS_$(BUILD_MODE)) $(CFLAGS_CC) -c -o $@ $<
out/$(BUILD_MODE)/libweave_exports_testrunner : $(weave_exports_unittest_obj_files) out/$(BUILD_MODE)/libweave.so out/$(BUILD_MODE)/libweave-test.a out/$(BUILD_MODE)/src/test/weave_testrunner.o
- $(CXX) -o $@ $^ -lcrypto -lexpat -lgmock -lgtest -lpthread -lrt -Lthird_party/lib -Wl,-rpath=out/$(BUILD_MODE)/
+ $(CXX) -o $@ $^ $(CFLAGS) -lcrypto -lexpat -lgmock -lgtest -lpthread -lrt -Lthird_party/lib -Wl,-rpath=out/$(BUILD_MODE)/
export-test : out/$(BUILD_MODE)/libweave_exports_testrunner
$<