StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove dangling reference to LLVMgold.so" into main am: 7859cc45f7 am: 829f7e9de6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2665360

Change-Id: I187a71ad8d8a6091f3f4470eb9741f0c7248580c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yi Kong
2023-07-20 18:28:40 +00:00
committed by Automerger Merge Worker
parent f7cccf6722 829f7e9de6
commit 7ebddc1486
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/config_sanitizers.mk
View File

@@ -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))