diff options
| author | Dan Albert <danalbert@google.com> | 2015-03-27 20:27:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-27 20:27:13 +0000 |
| commit | beed47390a60f6f0c77532b3d3f76bb47ef49423 (patch) | |
| tree | 63f8c75cf5cf4520ec17248c18a0d07490fe4ef3 | |
| parent | b7d2e72b02a4cb8034f32f8247a2558d2434e121 (diff) | |
| parent | 79e151de0b42d848527cce60d19d5d2165129324 (diff) | |
| download | external_llvm-beed47390a60f6f0c77532b3d3f76bb47ef49423.zip external_llvm-beed47390a60f6f0c77532b3d3f76bb47ef49423.tar.gz external_llvm-beed47390a60f6f0c77532b3d3f76bb47ef49423.tar.bz2 | |
Merge "Remove uses of libcxx.mk."
| -rw-r--r-- | llvm-device-build.mk | 3 | ||||
| -rw-r--r-- | llvm-host-build.mk | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/llvm-device-build.mk b/llvm-device-build.mk index 5d863f5..823209d 100644 --- a/llvm-device-build.mk +++ b/llvm-device-build.mk @@ -58,14 +58,11 @@ LOCAL_CPPFLAGS := \ # Make sure bionic is first so we can include system headers. LOCAL_C_INCLUDES := \ bionic \ - external/libcxx/include \ $(LLVM_ROOT_PATH) \ $(LLVM_ROOT_PATH)/include \ $(LLVM_ROOT_PATH)/device/include \ $(LOCAL_C_INCLUDES) -include external/libcxx/libcxx.mk - ########################################################### ## Commands for running tblgen to compile a td file ########################################################### diff --git a/llvm-host-build.mk b/llvm-host-build.mk index a3c9539..0b6bc07 100644 --- a/llvm-host-build.mk +++ b/llvm-host-build.mk @@ -1,7 +1,6 @@ # Windows can't use Clang to build yet ifneq ($(HOST_OS),windows) LOCAL_CLANG := true -include external/libcxx/libcxx.mk endif LOCAL_CFLAGS += \ |