diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-06-17 20:51:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-17 20:51:15 +0000 |
| commit | 717b462e8648e6e62ab9d39128a2f7e776bdf8ab (patch) | |
| tree | 8ac093ee407966d10b6513995a33d9d783160035 | |
| parent | 6bf1da7a67eff66c8f6dac5dbdd8322d33b81a67 (diff) | |
| parent | d57bb3dac3617465b82b810bf85cb86912138e54 (diff) | |
| download | mclinker-717b462e8648e6e62ab9d39128a2f7e776bdf8ab.tar.gz | |
am d57bb3da: Merge "Don\'t build with libc++ when building for Windows SDK."
* commit 'd57bb3dac3617465b82b810bf85cb86912138e54':
Don't build with libc++ when building for Windows SDK.
| -rw-r--r-- | mcld-host-build.mk | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mcld-host-build.mk b/mcld-host-build.mk index e427b31..5d63a76 100644 --- a/mcld-host-build.mk +++ b/mcld-host-build.mk @@ -24,6 +24,14 @@ ifeq ($(HOST_OS),darwin) LOCAL_CFLAGS += -DDARWIN_FLEX=1 endif +ifeq ($(HOST_OS),windows) +LOCAL_C_INCLUDES := \ + $(MCLD_ROOT_PATH)/include \ + $(LLVM_ROOT_PATH) \ + $(LLVM_ROOT_PATH)/include \ + $(LLVM_ROOT_PATH)/host/include \ + $(LOCAL_C_INCLUDES) +else LOCAL_C_INCLUDES := \ $(MCLD_ROOT_PATH)/include \ $(LLVM_ROOT_PATH) \ @@ -31,5 +39,6 @@ LOCAL_C_INCLUDES := \ $(LLVM_ROOT_PATH)/host/include \ external/libcxx/include \ $(LOCAL_C_INCLUDES) +endif LOCAL_IS_HOST_MODULE := true |