diff options
| author | Stephen Hines <srhines@google.com> | 2012-09-13 19:06:52 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2012-09-13 19:06:52 -0700 |
| commit | 99e8132d3daedcebd061aacb0b08d1e1a6dab14c (patch) | |
| tree | 4c816050f64e6b7de0984adb5cd3a0a6723c3703 | |
| parent | 68aeecc773d36c4be9adf32d1f09ec739574c880 (diff) | |
| parent | 828ded66831c0caaeecd2291a6bfb084f373d0e4 (diff) | |
| download | llvm-jb-mr1-dev.tar.gz | |
Merge branch 'jb-mr1-dev' of https://googleplex-android.googlesource.com/a/platform/external/llvm into merge-2012_09_10android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1.1-releasejb-mr1.1-devjb-mr1-releasejb-mr1-dev
| -rw-r--r-- | lib/Target/ARM/AsmParser/Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/Target/ARM/AsmParser/Android.mk b/lib/Target/ARM/AsmParser/Android.mk index 105e46374f06..5e64e2773ec7 100644 --- a/lib/Target/ARM/AsmParser/Android.mk +++ b/lib/Target/ARM/AsmParser/Android.mk @@ -34,9 +34,11 @@ TBLGEN_TD_DIR := $(arm_asm_parser_TBLGEN_TD_DIR) include $(LLVM_HOST_BUILD_MK) include $(LLVM_TBLGEN_RULES_MK) -ifeq (darwin,$(BUILD_OS)) +ifneq (,$(filter windows darwin,$(HOST_OS))) # Override the default optimization level to work around taking forever (~50m) -# to compile ARMAsmParser.cpp on Mac with gcc 4.2. +# to compile ARMAsmParser.cpp on Mac with gcc 4.2, +# or on Linux with mingw32msvc-gcc 4.2, which is used to cross-compile +# the win_sdk. LOCAL_CFLAGS += -O0 endif include $(BUILD_HOST_STATIC_LIBRARY) |