From fd378f3c179360258b0f982e736af17626b99a4f Mon Sep 17 00:00:00 2001
From: Moritz Gmeiner <moritz@gmeiner.net>
Date: Sun, 22 Jun 2025 19:41:10 +0200
Subject: [PATCH] updated compiler envs a bit

---
 env/bfd                |  4 ++++
 env/clang              |  4 +---
 env/clang-18           | 34 ----------------------------------
 env/clang-19           |  4 +---
 env/clang-20           |  4 +---
 env/gcc                |  4 +---
 env/lld                |  1 +
 package.env/00compiler |  4 +---
 8 files changed, 10 insertions(+), 49 deletions(-)
 create mode 100644 env/bfd
 delete mode 100644 env/clang-18

diff --git a/env/bfd b/env/bfd
new file mode 100644
index 0000000..0965f74
--- /dev/null
+++ b/env/bfd
@@ -0,0 +1,4 @@
+LD="ld.bfd"
+
+LDFLAGS="${LDFLAGS} -fuse-ld=bfd"
+
diff --git a/env/clang b/env/clang
index 03c319d..e751298 100644
--- a/env/clang
+++ b/env/clang
@@ -21,13 +21,11 @@ READELF="llvm-readelf"
 ADDR2LINE="llvm-addr2line"
 
 
-LD="ld.lld"
-
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 
 LDFLAGS="${LDFLAGS} -rtlib=compiler-rt -unwindlib=libunwind"
 
-LDFLAGS="${LDFLAGS} -fuse-ld=lld -flto"
+LDFLAGS="${LDFLAGS} -flto"
 
 
 USE="${USE} clang llvm-libunwind"
diff --git a/env/clang-18 b/env/clang-18
deleted file mode 100644
index 1a1c23a..0000000
--- a/env/clang-18
+++ /dev/null
@@ -1,34 +0,0 @@
-COMMON_FLAGS="-O2 -pipe -march=native -flto=thin"
-
-CFLAGS="${COMMON_FLAGS}"
-CXXFLAGS="${COMMON_FLAGS}"
-FCFLAGS="${COMMON_FLAGS}"
-FFLAGS="${COMMON_FLAGS}"
-
-CC="clang-18"
-CXX="clang++-18"
-
-AR="llvm-ar"
-AS="clang-18 -c"
-CPP="clang-cpp-18"
-NM="llvm-nm"
-STRIP="llvm-strip"
-RANLIB="llvm-ranlib"
-OBJCOPY="llvm-objcopy"
-STRINGS="llvm-strings"
-OBJDUMP="llvm-objdump"
-READELF="llvm-readelf"
-ADDR2LINE="llvm-addr2line"
-
-
-LD="ld.lld"
-
-LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-
-LDFLAGS="${LDFLAGS} -rtlib=compiler-rt -unwindlib=libunwind"
-
-LDFLAGS="${LDFLAGS} -fuse-ld=lld -flto"
-
-# RUSTFLAGS="-C target-cpu=native -C opt-level=3 -C linker=clang-18 -C link-arg=-fuse-ld=mold" 
-
-USE="${USE} clang llvm-libunwind"
diff --git a/env/clang-19 b/env/clang-19
index d4f1e6e..2241ba5 100644
--- a/env/clang-19
+++ b/env/clang-19
@@ -21,13 +21,11 @@ READELF="llvm-readelf"
 ADDR2LINE="llvm-addr2line"
 
 
-LD="ld.lld"
-
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 
 LDFLAGS="${LDFLAGS} -rtlib=compiler-rt -unwindlib=libunwind"
 
-LDFLAGS="${LDFLAGS} -fuse-ld=lld -flto"
+LDFLAGS="${LDFLAGS} -flto"
 
 # RUSTFLAGS="-C target-cpu=native -C opt-level=3 -C linker=clang-19 -C link-arg=-fuse-ld=mold" 
 
diff --git a/env/clang-20 b/env/clang-20
index b3f53f9..518baed 100644
--- a/env/clang-20
+++ b/env/clang-20
@@ -21,13 +21,11 @@ READELF="llvm-readelf"
 ADDR2LINE="llvm-addr2line"
 
 
-LD="ld.lld"
-
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 
 LDFLAGS="${LDFLAGS} -rtlib=compiler-rt -unwindlib=libunwind"
 
-LDFLAGS="${LDFLAGS} -fuse-ld=lld -flto"
+LDFLAGS="${LDFLAGS} -flto"
 
 # RUSTFLAGS="-C target-cpu=native -C opt-level=3 -C linker=clang-20 -C link-arg=-fuse-ld=mold" 
 
diff --git a/env/gcc b/env/gcc
index c474124..575f57a 100644
--- a/env/gcc
+++ b/env/gcc
@@ -23,8 +23,6 @@ READELF="readelf"
 ADDR2LINE="addr2line"
 
 
-LD="ld.bfd"
-
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 
-LDFLAGS="${LDFLAGS} -fuse-ld=bfd -flto"
+LDFLAGS="${LDFLAGS} -flto"
diff --git a/env/lld b/env/lld
index 5882f4e..86f0c82 100644
--- a/env/lld
+++ b/env/lld
@@ -1,2 +1,3 @@
 LD="ld.lld"
+
 LDFLAGS="${LDFLAGS} -fuse-ld=lld"
diff --git a/package.env/00compiler b/package.env/00compiler
index 6c435c2..f8eab70 100644
--- a/package.env/00compiler
+++ b/package.env/00compiler
@@ -57,9 +57,7 @@ app-crypt/seahorse gcc
 
 dev-scheme/racket gcc
 
-llvm-core/llvm:18 clang-18
-llvm-core/clang:18 clang-18
-
 dev-python/zstandard gcc
 
 llvm-core/lldb lto-werror
+