* commit 'e99d8947c09731d71db7e95a280cf81f51f4049a': Inhibit implicit -Bsymolic in -shared.
This commit is contained in:
@@ -332,6 +332,7 @@ ifneq ($(LOCAL_NO_SYNTAX_CHECK),true)
|
||||
endif
|
||||
endif
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CXX := $(my_cxx)
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CLANG := $(my_clang)
|
||||
|
||||
# TODO: support a mix of standard extensions so that this isn't necessary
|
||||
LOCAL_CPP_EXTENSION := $(strip $(LOCAL_CPP_EXTENSION))
|
||||
|
@@ -196,7 +196,7 @@ define $(combo_2nd_arch_prefix)transform-o-to-shared-lib-inner
|
||||
$(hide) $(PRIVATE_CXX) \
|
||||
-nostdlib -Wl,-soname,$(notdir $@) \
|
||||
-Wl,--gc-sections \
|
||||
-shared \
|
||||
$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \
|
||||
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
|
||||
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \
|
||||
$(PRIVATE_ALL_OBJECTS) \
|
||||
|
@@ -162,7 +162,7 @@ define transform-o-to-shared-lib-inner
|
||||
$(hide) $(PRIVATE_CXX) \
|
||||
-nostdlib -Wl,-soname,$(notdir $@) \
|
||||
-Wl,--gc-sections \
|
||||
-shared \
|
||||
$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \
|
||||
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
|
||||
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \
|
||||
$(PRIVATE_ALL_OBJECTS) \
|
||||
|
@@ -168,7 +168,7 @@ define $(combo_2nd_arch_prefix)transform-o-to-shared-lib-inner
|
||||
$(hide) $(PRIVATE_CXX) \
|
||||
-nostdlib -Wl,-soname,$(notdir $@) \
|
||||
-Wl,--gc-sections \
|
||||
-shared \
|
||||
$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \
|
||||
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
|
||||
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \
|
||||
$(PRIVATE_ALL_OBJECTS) \
|
||||
|
@@ -172,7 +172,7 @@ define transform-o-to-shared-lib-inner
|
||||
$(hide) $(PRIVATE_CXX) \
|
||||
-nostdlib -Wl,-soname,$(notdir $@) \
|
||||
-Wl,--gc-sections \
|
||||
-shared \
|
||||
$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \
|
||||
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
|
||||
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \
|
||||
$(PRIVATE_ALL_OBJECTS) \
|
||||
|
@@ -152,7 +152,7 @@ define $(combo_2nd_arch_prefix)transform-o-to-shared-lib-inner
|
||||
$(hide) $(PRIVATE_CXX) \
|
||||
$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
|
||||
-nostdlib -Wl,-soname,$(notdir $@) \
|
||||
-shared \
|
||||
$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \
|
||||
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
|
||||
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \
|
||||
$(PRIVATE_ALL_OBJECTS) \
|
||||
|
@@ -156,7 +156,7 @@ define transform-o-to-shared-lib-inner
|
||||
$(hide) $(PRIVATE_CXX) \
|
||||
$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
|
||||
-nostdlib -Wl,-soname,$(notdir $@) \
|
||||
-shared \
|
||||
$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \
|
||||
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
|
||||
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \
|
||||
$(PRIVATE_ALL_OBJECTS) \
|
||||
|
@@ -1309,7 +1309,7 @@ $(hide) $(PRIVATE_CXX) \
|
||||
$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
|
||||
-Wl,-rpath-link=$(PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES) \
|
||||
-Wl,-rpath,\$$ORIGIN/../lib \
|
||||
-shared -Wl,-soname,$(notdir $@) \
|
||||
-Wl,-shared -Wl,-soname,$(notdir $@) \
|
||||
$(PRIVATE_LDFLAGS) \
|
||||
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
|
||||
$(PRIVATE_ALL_OBJECTS) \
|
||||
|
Reference in New Issue
Block a user