diff options
| author | Ying Wang <wangying@google.com> | 2015-04-09 09:22:36 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-04-09 09:45:39 -0700 |
| commit | 4972d195ddb886460cd3a8de6c101f7a0ccd1096 (patch) | |
| tree | 9886550e4787cda8e129cc8fc584d4b9c117bcfc /core/combo | |
| parent | 597bdd70c1e17630e9c942bfeca339929e794793 (diff) | |
| download | build-4972d195ddb886460cd3a8de6c101f7a0ccd1096.zip build-4972d195ddb886460cd3a8de6c101f7a0ccd1096.tar.gz build-4972d195ddb886460cd3a8de6c101f7a0ccd1096.tar.bz2 | |
Remove ancient ranlib workaround on Mac OS X.
Apparently we don't need it for Mac OS X 10.7 and above.
Change-Id: I5ee81700c16e8c66b2d5f2b373fd2d523b5ec018
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/HOST_darwin-x86.mk | 8 | ||||
| -rw-r--r-- | core/combo/HOST_darwin-x86_64.mk | 5 |
2 files changed, 1 insertions, 12 deletions
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index 7fa48ff..8389bb8 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -56,12 +56,6 @@ $(combo_2nd_arch_prefix)HOST_JNILIB_SUFFIX := .jnilib $(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += \ -include $(call select-android-config-h,darwin-x86) -ifneq ($(filter 10.7 10.7.% 10.8 10.8.%, $(build_mac_version)),) - $(combo_2nd_arch_prefix)HOST_RUN_RANLIB_AFTER_COPYING := false -else - $(combo_2nd_arch_prefix)HOST_RUN_RANLIB_AFTER_COPYING := true - PRE_LION_DYNAMIC_LINKER_OPTIONS := -Wl,-dynamic -endif $(combo_2nd_arch_prefix)HOST_GLOBAL_ARFLAGS := cqs ############################################################ @@ -91,7 +85,7 @@ define transform-host-o-to-executable-inner $(hide) $(PRIVATE_CXX) \ -Wl,-rpath,@loader_path/../$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES)) \ -o $@ \ - $(PRE_LION_DYNAMIC_LINKER_OPTIONS) -Wl,-headerpad_max_install_names \ + -Wl,-headerpad_max_install_names \ $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_LD_DIRS) \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(PRIVATE_HOST_GLOBAL_LDFLAGS) \ diff --git a/core/combo/HOST_darwin-x86_64.mk b/core/combo/HOST_darwin-x86_64.mk index c06933d..0efa78f 100644 --- a/core/combo/HOST_darwin-x86_64.mk +++ b/core/combo/HOST_darwin-x86_64.mk @@ -55,11 +55,6 @@ HOST_JNILIB_SUFFIX := .jnilib HOST_GLOBAL_CFLAGS += \ -include $(call select-android-config-h,darwin-x86) -ifneq ($(filter 10.7 10.7.% 10.8 10.8.%, $(build_mac_version)),) - HOST_RUN_RANLIB_AFTER_COPYING := false -else - HOST_RUN_RANLIB_AFTER_COPYING := true -endif HOST_GLOBAL_ARFLAGS := cqs # We Reuse the following functions with the same name from HOST_darwin-x86.mk: |