diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-10-14 17:55:28 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-10-14 17:55:28 -0700 |
| commit | 8b5b69813ef4d718db2e38e51867883511a3eeea (patch) | |
| tree | ae0e2b8dfe9ae64554a43a20acdf47173295b43c | |
| parent | cfd8adec84701752a56ddccf556b8c40142a9e0f (diff) | |
| download | art-8b5b69813ef4d718db2e38e51867883511a3eeea.zip art-8b5b69813ef4d718db2e38e51867883511a3eeea.tar.gz art-8b5b69813ef4d718db2e38e51867883511a3eeea.tar.bz2 | |
Fix mac build (second attempt)
It appears that the version of mac ld with
-export_dynamic is pretty recent.
Remove -export_dynamic to fix build for older
mac versions (?)
Change-Id: Ibc3b2f9a0aeec9125cd73b7df0cf22de9e8e4d16
| -rw-r--r-- | build/Android.executable.mk | 2 | ||||
| -rw-r--r-- | build/Android.gtest.mk | 2 | ||||
| -rw-r--r-- | dalvikvm/Android.mk | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/build/Android.executable.mk b/build/Android.executable.mk index c1cef99..02252ab 100644 --- a/build/Android.executable.mk +++ b/build/Android.executable.mk @@ -68,8 +68,6 @@ define build-art-executable # Mac OS linker doesn't understand --export-dynamic/--version-script. ifneq ($$(HOST_OS)-$$(art_target_or_host),darwin-host) LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic - else - LOCAL_LDFLAGS := -Wl,-export_dynamic endif ifeq ($$(art_target_or_host),target) diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index b38e64e..3e100e9 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -346,8 +346,6 @@ define define-art-gtest ifneq ($$(HOST_OS)-$$(art_target_or_host),darwin-host) # Allow jni_compiler_test to find Java_MyClassNatives_bar within itself using dlopen(NULL, ...). LOCAL_LDFLAGS := -Wl,--export-dynamic -Wl,-u,Java_MyClassNatives_bar -Wl,-u,Java_MyClassNatives_sbar - else - LOCAL_LDFLAGS := -Wl,-export_dynamic endif LOCAL_CFLAGS := $$(ART_TEST_CFLAGS) diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index d5f3586..0bab429 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -59,8 +59,6 @@ LOCAL_LDFLAGS := -ldl -lpthread # Mac OS linker doesn't understand --export-dynamic. ifneq ($(HOST_OS),darwin) LOCAL_LDFLAGS += -Wl,--export-dynamic -else - LOCAL_LDFLAGS += -Wl,-export_dynamic endif LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.common.mk |