git: 911dfbcb4051 - main - devel/llvm13: Fix install without FLANG

Brooks Davis brooks at FreeBSD.org
Tue Aug 31 22:47:26 UTC 2021


The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=911dfbcb4051a36ecafb23f35cb8103e78019b88

commit 911dfbcb4051a36ecafb23f35cb8103e78019b88
Author:     Brooks Davis <brooks at FreeBSD.org>
AuthorDate: 2021-08-31 22:47:14 +0000
Commit:     Brooks Davis <brooks at FreeBSD.org>
CommitDate: 2021-08-31 22:47:14 +0000

    devel/llvm13: Fix install without FLANG
    
    Add f18 to the set of FLANG commands to it it linked as f1813
    (awkward...) and only in the plist when FLANG is built.
    
    Reported by:    kib
    Sponsored by:   DARPA
---
 devel/llvm13/Makefile.COMMANDS | 1 +
 devel/llvm13/pkg-plist         | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/devel/llvm13/Makefile.COMMANDS b/devel/llvm13/Makefile.COMMANDS
index a768fe27516f..091756696040 100644
--- a/devel/llvm13/Makefile.COMMANDS
+++ b/devel/llvm13/Makefile.COMMANDS
@@ -99,6 +99,7 @@ EXTRAS_COMMANDS= \
 		run-clang-tidy
 
 FLANG_COMMANDS= \
+		f18 \
 		f18-parse-demo \
 		fir-opt \
 		flang \
diff --git a/devel/llvm13/pkg-plist b/devel/llvm13/pkg-plist
index 60ec205543d6..d356aa093b65 100644
--- a/devel/llvm13/pkg-plist
+++ b/devel/llvm13/pkg-plist
@@ -94,6 +94,7 @@ bin/intercept-build%%LLVM_SUFFIX%%
 %%EXTRAS%%bin/modularize%%LLVM_SUFFIX%%
 %%EXTRAS%%bin/pp-trace%%LLVM_SUFFIX%%
 %%EXTRAS%%bin/run-clang-tidy%%LLVM_SUFFIX%%
+%%FLANG%%bin/f18%%LLVM_SUFFIX%%
 %%FLANG%%bin/f18-parse-demo%%LLVM_SUFFIX%%
 %%FLANG%%bin/fir-opt%%LLVM_SUFFIX%%
 %%FLANG%%bin/flang%%LLVM_SUFFIX%%
@@ -176,7 +177,7 @@ llvm%%LLVM_SUFFIX%%/bin/bugpoint
 %%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/clangd
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/diagtool
 llvm%%LLVM_SUFFIX%%/bin/dsymutil
-llvm%%LLVM_SUFFIX%%/bin/f18
+%%FLANG%%llvm%%LLVM_SUFFIX%%/bin/f18
 %%FLANG%%llvm%%LLVM_SUFFIX%%/bin/f18-parse-demo
 %%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/find-all-symbols
 %%FLANG%%llvm%%LLVM_SUFFIX%%/bin/fir-opt


More information about the dev-commits-ports-all mailing list