summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2017-09-26 17:37:42 -0700
committerDan Willemsen <dwillemsen@google.com>2017-09-26 17:40:10 -0700
commit29a0fef319dddfc28c002755027b19e937948bd8 (patch)
tree5ad52e3b2933fdf34400058eab00368926e39357
parent8ea4f8e13710fe1536a0d1647cf48193bd815ab2 (diff)
downloadclang-tools-extra-dev.tar.gz
libm does not exist on windowsdev
Mingw provides a stub library for scripts that add it, but we're not including it in our list of allowed libraries, since it's not necessary: https://android-review.googlesource.com/c/platform/build/+/494243 I'm probably going to be making it a default on darwin/linux shortly in order to match the default set of libraries on Android (similar to how -ldl / -lpthread / -lrt are defaults when available now). We can clean up uses of that later. Test: OUT_DIR=out python external/clang/build.py --no-multi-stage --no-pgo-clang --no-debug-clang Change-Id: Ia3c897270bcdf689c4dec5a28fd63f3d87eda1c6
-rw-r--r--clang-tidy/Android.common.mk5
-rw-r--r--clang-tidy/Android.mk5
2 files changed, 4 insertions, 6 deletions
diff --git a/clang-tidy/Android.common.mk b/clang-tidy/Android.common.mk
index b481aedc..db79b29d 100644
--- a/clang-tidy/Android.common.mk
+++ b/clang-tidy/Android.common.mk
@@ -9,10 +9,9 @@ TBLGEN_TABLES := \
DiagnosticCommonKinds.inc \
StmtNodes.inc \
-LOCAL_LDLIBS += -lm
LOCAL_LDLIBS_windows := -limagehlp -lversion
-LOCAL_LDLIBS_darwin := -lpthread -ldl
-LOCAL_LDLIBS_linux := -lpthread -ldl
+LOCAL_LDLIBS_darwin := -lpthread -ldl -lm
+LOCAL_LDLIBS_linux := -lpthread -ldl -lm
# remove when we can use PIE binaries in all places again
LOCAL_NO_FPIE := true
diff --git a/clang-tidy/Android.mk b/clang-tidy/Android.mk
index b84bc511..5c3777dd 100644
--- a/clang-tidy/Android.mk
+++ b/clang-tidy/Android.mk
@@ -42,10 +42,9 @@ LOCAL_STATIC_LIBRARIES := \
libclangTooling \
libclangToolingCore \
-LOCAL_LDLIBS += -lm
LOCAL_LDLIBS_windows := -limagehlp -lversion
-LOCAL_LDLIBS_darwin := -lpthread -ldl
-LOCAL_LDLIBS_linux := -lpthread -ldl
+LOCAL_LDLIBS_darwin := -lpthread -ldl -lm
+LOCAL_LDLIBS_linux := -lpthread -ldl -lm
# remove when we can use PIE binaries in all places again
LOCAL_NO_FPIE := true