Merge "Remove dangling reference to LLVMgold.so" into main am: 7859cc45f7
am: 829f7e9de6
am: 7ebddc1486
Original change: https://android-review.googlesource.com/c/platform/build/+/2665360 Change-Id: Ic1301b92ac0d7237ca30b7282ac20b69f7d2c5b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -413,7 +413,6 @@ ifneq ($(filter cfi,$(my_sanitize)),)
|
|||||||
my_cflags += -fvisibility=default
|
my_cflags += -fvisibility=default
|
||||||
endif
|
endif
|
||||||
my_ldflags += $(CFI_EXTRA_LDFLAGS)
|
my_ldflags += $(CFI_EXTRA_LDFLAGS)
|
||||||
my_arflags += --plugin $(LLVM_PREBUILTS_PATH)/../lib64/LLVMgold.so
|
|
||||||
|
|
||||||
ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
|
ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
|
||||||
my_ldflags := $(filter-out -fsanitize-cfi-cross-dso,$(my_ldflags))
|
my_ldflags := $(filter-out -fsanitize-cfi-cross-dso,$(my_ldflags))
|
||||||
|
Reference in New Issue
Block a user