From f4450a359a08c09b88cb64c4a2ea25f983535dfb Mon Sep 17 00:00:00 2001 From: Dmitriy Ivanov Date: Tue, 14 Oct 2014 17:55:28 -0700 Subject: [PATCH] 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 (?) (cherry picked from commit 8b5b69813ef4d718db2e38e51867883511a3eeea) Change-Id: I272d4b2c95411cc8126f27468f5199ff932fc9ef --- build/Android.executable.mk | 2 -- build/Android.gtest.mk | 2 -- dalvikvm/Android.mk | 2 -- 3 files changed, 6 deletions(-) diff --git a/build/Android.executable.mk b/build/Android.executable.mk index c1cef9926..02252ab02 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 6038a26c4..bf9e9ecbd 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -337,8 +337,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 d5f358640..0bab429e8 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 -- 2.11.0