Merge "Use _WIN32 rather than WIN32."

[android-x86/external-llvm.git] / shared_llvm.mk

diff --git a/shared_llvm.mk b/shared_llvm.mk
index fff83dc..183618c 100644 (file)
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -64,7 +64,8 @@ llvm_post_static_libraries := \
   libLLVMOption \
   libLLVMSupport \
   libLLVMVectorize \
-  libLLVMProfileData
+  libLLVMProfileData \
+  libLLVMLibDriver
 
 llvm_host_static_libraries := \
   libLLVMExecutionEngine \
@@ -92,7 +93,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
   $(llvm_post_static_libraries)
 
 ifeq ($(HOST_OS),windows)
-  LOCAL_LDLIBS := -limagehlp -lpsapi
+  LOCAL_LDLIBS := -limagehlp -lpsapi -lole32
 else
   LOCAL_LDLIBS := -ldl -lpthread
 endif
@@ -127,7 +128,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES_arm64 += $(llvm_arm_static_libraries)
 
 ifeq ($(BUILD_ARM_FOR_X86),true)
 LOCAL_WHOLE_STATIC_LIBRARIES_x86 += $(llvm_arm_static_libraries)
+LOCAL_WHOLE_STATIC_LIBRARIES_x86 += $(llvm_aarch64_static_libraries)
 LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_arm_static_libraries)
+LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_aarch64_static_libraries)
 endif
 
 LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_post_static_libraries)