diff --git a/env/clang b/env/clang
index e49c047..47583b0 100644
--- a/env/clang
+++ b/env/clang
@@ -6,10 +6,11 @@ FFLAGS="${COMMON_FLAGS}"
 
 CC="clang"
 CXX="clang++"
+
 AR="llvm-ar"
 NM="llvm-nm"
 RANLIB="llvm-ranlib"
 
 LDFLAGS="-Wl,--as-needed -rtlib=compiler-rt -unwindlib=libunwind"
 
-USE="clang"
+USE="clang llvm-libunwind"
diff --git a/env/lld b/env/lld
index 87c2254..91cb8e9 100644
--- a/env/lld
+++ b/env/lld
@@ -1 +1,2 @@
+LD-"ld.lld"
 LDFLAGS="${LDFLAGS} -fuse-ld=lld"