diff options
| author | Tim Murray <timmurray@google.com> | 2014-04-28 14:30:53 -0700 |
|---|---|---|
| committer | Tim Murray <timmurray@google.com> | 2014-04-28 14:30:53 -0700 |
| commit | 6b161a1f96ff3ba5fe2cfd1428f12bf599d11d8a (patch) | |
| tree | 6135cb14f6ac740aa71f62adb053b4726aab1503 | |
| parent | 61f99ffc0d77f1c1d5306d070b90fba0c2c05fbe (diff) | |
| download | clang_35a-6b161a1f96ff3ba5fe2cfd1428f12bf599d11d8a.tar.gz | |
Update build system for rebase.
Change-Id: I361682eefe119e3f7cba22adb4e78eadca61c86b
| -rw-r--r-- | clang-host-build.mk | 4 | ||||
| -rw-r--r-- | host_shared_clang.mk | 2 | ||||
| -rw-r--r-- | tools/driver/Android.mk | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/clang-host-build.mk b/clang-host-build.mk index e0ba2e6aed..e116c0260b 100644 --- a/clang-host-build.mk +++ b/clang-host-build.mk @@ -11,12 +11,14 @@ LOCAL_CPPFLAGS := \ # Make sure bionic is first so we can include system headers. LOCAL_C_INCLUDES := \ $(CLANG_ROOT_PATH)/include \ - $(CLANG_ROOT_PATH)/lib/CodeGen \ + $(CLANG_ROOT_PATH)/lib/CodeGen \ $(LOCAL_C_INCLUDES) LLVM_ROOT_PATH := external/llvm include $(LLVM_ROOT_PATH)/llvm.mk +include external/libcxx/libcxx.mk + ifneq ($(LLVM_HOST_BUILD_MK),) include $(LLVM_HOST_BUILD_MK) endif diff --git a/host_shared_clang.mk b/host_shared_clang.mk index f9e4181035..566f3ab363 100644 --- a/host_shared_clang.mk +++ b/host_shared_clang.mk @@ -26,7 +26,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libclangRewriteCore \ libclangSerialization -LOCAL_SHARED_LIBRARIES := libLLVM +LOCAL_SHARED_LIBRARIES := libLLVM libc++ ifeq ($(HOST_OS),windows) LOCAL_LDLIBS := -limagehlp -lpsapi diff --git a/tools/driver/Android.mk b/tools/driver/Android.mk index e7af560d0f..aa00a0d67b 100644 --- a/tools/driver/Android.mk +++ b/tools/driver/Android.mk @@ -91,7 +91,8 @@ LOCAL_STATIC_LIBRARIES := \ libLLVMCore \ libLLVMOption \ libLLVMSupport \ - libLLVMTarget + libLLVMTarget \ + libLLVMProfileData LOCAL_LDLIBS += -lm ifdef USE_MINGW |