diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-10-17 15:48:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-17 15:48:07 +0000 |
| commit | ffb078ee815a38123581e706099a3bed65a6cb24 (patch) | |
| tree | 96cd76e36a7cfaaf0e260e2bd07bd497e30988bc /runtime/Android.mk | |
| parent | 02e7d4e802248574cee7224fea3352b6e558e4ee (diff) | |
| parent | c9596958f8da9603c2b17a5df4d7fa6cbd01ff1e (diff) | |
| download | art-ffb078ee815a38123581e706099a3bed65a6cb24.zip art-ffb078ee815a38123581e706099a3bed65a6cb24.tar.gz art-ffb078ee815a38123581e706099a3bed65a6cb24.tar.bz2 | |
Merge "Add -no-integrated-as at local level."
Diffstat (limited to 'runtime/Android.mk')
| -rw-r--r-- | runtime/Android.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/runtime/Android.mk b/runtime/Android.mk index dbafb83..d9b4139 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk @@ -369,6 +369,13 @@ define build-libart art_ndebug_or_debug := $(2) include $$(CLEAR_VARS) + # Clang assembler has problem with macros in asm_support_x86.S, http://b/17443165, + # on linux. Yet sdk on mac needs integrated assembler. + ifeq ($$(HOST_OS),darwin) + LOCAL_CLANG_ASFLAGS += -integrated-as + else + LOCAL_CLANG_ASFLAGS += -no-integrated-as + endif LOCAL_CPP_EXTENSION := $$(ART_CPP_EXTENSION) ifeq ($$(art_ndebug_or_debug),ndebug) LOCAL_MODULE := libart |