summaryrefslogtreecommitdiffstats
path: root/tools/llvm-as
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2013-08-02 17:58:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-02 17:58:41 -0700
commit8197ac1c1a0a91baa70c4dea8cb488f254ef974c (patch)
treee3e7a58e3e3eb388067ddd54c3086bcaa2c79e26 /tools/llvm-as
parent4d6d0d0d821489e866c4709126e5fa97e12735d6 (diff)
parent5dba11700ee9f7db1b61f85f02440d2464bc2f9e (diff)
downloadexternal_llvm-8197ac1c1a0a91baa70c4dea8cb488f254ef974c.zip
external_llvm-8197ac1c1a0a91baa70c4dea8cb488f254ef974c.tar.gz
external_llvm-8197ac1c1a0a91baa70c4dea8cb488f254ef974c.tar.bz2
am 5dba1170: am c7ef4e40: Fix Windows build issues for LLVM.
* commit '5dba11700ee9f7db1b61f85f02440d2464bc2f9e': Fix Windows build issues for LLVM.
Diffstat (limited to 'tools/llvm-as')
-rw-r--r--tools/llvm-as/Android.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/llvm-as/Android.mk b/tools/llvm-as/Android.mk
index 44f3d4f..e58868b 100644
--- a/tools/llvm-as/Android.mk
+++ b/tools/llvm-as/Android.mk
@@ -8,7 +8,12 @@ include $(CLEAR_VARS)
LOCAL_MODULE := llvm-as
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(llvm_as_SRC_FILES)
-LOCAL_LDLIBS += -lpthread -lm -ldl
+LOCAL_LDLIBS += -lm
+ifdef USE_MINGW
+LOCAL_LDLIBS += -limagehlp
+else
+LOCAL_LDLIBS += -lpthread -ldl
+endif
REQUIRES_EH := 1
REQUIRES_RTTI := 1