From 29a0fef319dddfc28c002755027b19e937948bd8 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 26 Sep 2017 17:37:42 -0700 Subject: libm does not exist on windows 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 --- clang-tidy/Android.common.mk | 5 ++--- clang-tidy/Android.mk | 5 ++--- 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 -- cgit v1.2.3