diff options
| author | 2014-10-14 23:12:15 +0000 | |
|---|---|---|
| committer | 2014-10-14 23:12:15 +0000 | |
| commit | 67555f1f1c890b12f5936bfa5a25efa70865970a (patch) | |
| tree | d2d1f43ba7b4c68203bfec288617b2d079987c31 | |
| parent | b13d4c592c187c54d6870b1d46601f3c00783fc7 (diff) | |
| parent | 1d74e57fa22fbcad1e14d776c771472b2d8438fb (diff) | |
Merge "Fixing mac build"
| -rw-r--r-- | build/Android.executable.mk | 8 | ||||
| -rw-r--r-- | build/Android.gtest.mk | 2 | ||||
| -rw-r--r-- | dalvikvm/Android.mk | 8 |
3 files changed, 16 insertions, 2 deletions
diff --git a/build/Android.executable.mk b/build/Android.executable.mk index e36b006173..c1cef9926c 100644 --- a/build/Android.executable.mk +++ b/build/Android.executable.mk @@ -65,7 +65,13 @@ define build-art-executable endif LOCAL_CFLAGS := $(ART_EXECUTABLES_CFLAGS) - LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic + # 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) $(call set-target-local-clang-vars) $(call set-target-local-cflags-vars,$(6)) diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 3e100e95ca..b38e64e16d 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -346,6 +346,8 @@ 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 b7e649ae38..d5f3586403 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -55,7 +55,13 @@ LOCAL_SRC_FILES := dalvikvm.cc ../sigchainlib/sigchain.cc LOCAL_CFLAGS := $(dalvikvm_cflags) LOCAL_C_INCLUDES := art/runtime LOCAL_SHARED_LIBRARIES := libnativehelper -LOCAL_LDFLAGS := -ldl -lpthread -Wl,--export-dynamic +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 LOCAL_IS_HOST_MODULE := true |