aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2022-05-03 18:58:34 +0000
committerBrooks Davis <brooks@FreeBSD.org>2022-05-03 18:58:34 +0000
commitf141ed66e36aeff760541a5867b7af61d005c8d3 (patch)
tree071e6985d6e8222d5c251e3e41265016e58f306e
parent03e4309f9f739856dbf9036e3e9752062dc1a511 (diff)
downloadports-f141ed66e36aeff760541a5867b7af61d005c8d3.tar.gz
ports-f141ed66e36aeff760541a5867b7af61d005c8d3.zip
devel/llvm-{cheri,morello}: Fix plist without LLD
The ld -> ld.lld symlink is enabled by the LLD option. Sponsored by: DARPA, AFRL
-rw-r--r--devel/llvm-cheri/Makefile2
-rw-r--r--devel/llvm-cheri/pkg-plist2
-rw-r--r--devel/llvm-morello/pkg-plist2
3 files changed, 3 insertions, 3 deletions
diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index 40e48b07deb6..596fe3afdaba 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -256,7 +256,7 @@ build-plist:
| ${SORT} >> ${PLIST}.tmp
awk '{ \
if ($$0 ~ /clang/ && $$0 !~ /omp.h/) {printf "%%%%CLANG%%%%"} \
- if ($$0 ~ /lld|wasm-ld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \
+ if ($$0 ~ /(bin\/(ld|lld|wasm-ld))|liblld[^b]|\/lld\// && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \
if ($$0 ~ /(argdumper|lldb)/) {printf "%%%%LLDB%%%%"} \
print \
}' \${PLIST}.tmp >> ${PLIST}
diff --git a/devel/llvm-cheri/pkg-plist b/devel/llvm-cheri/pkg-plist
index 78d335a792f8..8f12b403f588 100644
--- a/devel/llvm-cheri/pkg-plist
+++ b/devel/llvm-cheri/pkg-plist
@@ -113,7 +113,7 @@ llvm%%LLVM_SUFFIX%%/bin/dsymutil
%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/git-clang-format
llvm%%LLVM_SUFFIX%%/bin/hmaptool
llvm%%LLVM_SUFFIX%%/bin/intercept-build
-llvm%%LLVM_SUFFIX%%/bin/ld
+%%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld
%%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld.lld
%%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld
%%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld.darwinnew
diff --git a/devel/llvm-morello/pkg-plist b/devel/llvm-morello/pkg-plist
index ff1a3bdef8dc..d7034ef12f8f 100644
--- a/devel/llvm-morello/pkg-plist
+++ b/devel/llvm-morello/pkg-plist
@@ -113,7 +113,7 @@ llvm%%LLVM_SUFFIX%%/bin/dsymutil
%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/git-clang-format
llvm%%LLVM_SUFFIX%%/bin/hmaptool
llvm%%LLVM_SUFFIX%%/bin/intercept-build
-llvm%%LLVM_SUFFIX%%/bin/ld
+%%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld
%%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld.lld
%%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld
%%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld.darwinnew