7 files changed, 19 insertions, 15 deletions
diff --git a/src/build-data/arch/llvm.txt b/src/build-data/arch/llvm.txt
new file mode 100644
index 000000000..3b8c13ffd
--- /dev/null
+++ b/src/build-data/arch/llvm.txt
@@ -0,0 +1 @@
+wordsize 64
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index 2afd530d3..865809792 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -31,22 +31,17 @@ makefile_style gmake
 
 <so_link_commands>
 darwin        -> "$(CXX) -dynamiclib -fPIC -install_name $(INSTALLED_LIB_DIR)/$(SONAME_ABI) -current_version $(DARWIN_CURRENT_VER) -compatibility_version $(DARWIN_COMPATIBILITY_VER)"
-darwin-debug  -> "$(CXX) -dynamiclib -fPIC -install_name $(INSTALLED_LIB_DIR)/$(SONAME_ABI) -current_version $(DARWIN_CURRENT_VER) -compatibility_version $(DARWIN_COMPATIBILITY_VER)"
 
 # The default works for GNU ld and several other Unix linkers
 default       -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME_ABI)"
-default-debug -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME_ABI)"
 </so_link_commands>
 
 <binary_link_commands>
 darwin        -> "$(LINKER) -headerpad_max_install_names"
-darwin-debug  -> "$(LINKER) -headerpad_max_install_names"
 linux         -> "$(LINKER) -Wl,-rpath=\$$ORIGIN"
-linux-debug   -> "$(LINKER) -Wl,-rpath=\$$ORIGIN"
 freebsd       -> "$(LINKER) -Wl,-rpath=\$$ORIGIN"
-freebsd-debug -> "$(LINKER) -Wl,-rpath=\$$ORIGIN"
 default       -> "$(LINKER)"
-default-debug -> "$(LINKER)"
+llvm          -> "llvm-link"
 </binary_link_commands>
 
 <isa_flags>
@@ -64,6 +59,8 @@ altivec -> "-maltivec"
 </isa_flags>
 
 <mach_opt>
+all_llvm    -> "-emit-llvm -fno-use-cxa-atexit"
+
 x86_32      -> "-march=SUBMODEL"
 x86_64      -> "-march=SUBMODEL"
 nehalem     -> "-march=corei7"
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 5ace1931c..fdada6a3d 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -37,7 +37,6 @@ makefile_style gmake
 <so_link_commands>
 # The default works for GNU ld and several other Unix linkers
 default       -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME_ABI)"
-default-debug -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME_ABI)"
 
 # Darwin, HP-UX and Solaris linkers use different syntax
 darwin  -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME_ABI)"
@@ -51,9 +50,7 @@ openbsd -> "$(CXX) -shared -fPIC"
 
 <binary_link_commands>
 linux         -> "$(LINKER) -Wl,-rpath=\$$ORIGIN"
-linux-debug   -> "$(LINKER) -Wl,-rpath=\$$ORIGIN"
 default       -> "$(LINKER)"
-default-debug -> "$(LINKER)"
 </binary_link_commands>
 
 <isa_flags>
diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in
index 4b4426e5d..70b534503 100644
--- a/src/build-data/makefile/gmake.in
+++ b/src/build-data/makefile/gmake.in
@@ -38,11 +38,11 @@ cli: $(CLI)
 tests: $(TEST)
 
 $(CLI): $(LIBRARIES) $(CLIOBJS)
-	$(CLI_LINK_CMD) $(LDFLAGS) $(CLIOBJS) -L%{out_dir} -l%{libname} $(CLI_LINKS_TO) -o $(CLI)
+	$(CLI_LINK_CMD) $(LDFLAGS) $(CLIOBJS) $(CLI_LINKS_TO) -o $(CLI)
 	$(CLI_POST_LINK_CMD)
 
 $(TEST): $(LIBRARIES) $(TESTOBJS)
-	$(TEST_LINK_CMD) $(LDFLAGS) $(TESTOBJS) -L%{out_dir} -l%{libname} $(TEST_LINKS_TO) -o $(TEST)
+	$(TEST_LINK_CMD) $(LDFLAGS) $(TESTOBJS) $(TEST_LINKS_TO) -o $(TEST)
 	$(TEST_POST_LINK_CMD)
 
 $(STATIC_LIB): $(LIBOBJS)
diff --git a/src/build-data/makefile/gmake_fuzzers.in b/src/build-data/makefile/gmake_fuzzers.in
index 82fa8b256..62f7cdd29 100644
--- a/src/build-data/makefile/gmake_fuzzers.in
+++ b/src/build-data/makefile/gmake_fuzzers.in
@@ -2,12 +2,12 @@
 # Fuzzer build commands
 
 FUZZER_LINK_CMD = %{fuzzer_link_cmd}
-FUZZER_LINKS_TO = $(LIB_LINKS_TO) %{fuzzer_libs}
+FUZZER_LINKS_TO = %{link_to_botan} $(LIB_LINKS_TO) %{fuzzer_libs}
 FUZZER_FLAGS    = $(CXXFLAGS) $(WARN_FLAGS)
 
 %{fuzzer_build_cmds}
 
-FUZZERS=%{fuzzer_objs}
+FUZZERS=%{fuzzer_bin}
 
 fuzzers: libs $(FUZZERS)
 
diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in
index 1114cf2d6..a63a83f3a 100644
--- a/src/build-data/makefile/header.in
+++ b/src/build-data/makefile/header.in
@@ -11,8 +11,8 @@ CLI_LINK_CMD   = %{cli_link_cmd}
 TEST_LINK_CMD  = %{test_link_cmd}
 
 LIB_LINKS_TO   = %{link_to}
-CLI_LINKS_TO   = $(LIB_LINKS_TO)
-TEST_LINKS_TO  = $(LIB_LINKS_TO)
+CLI_LINKS_TO   = %{link_to_botan} $(LIB_LINKS_TO)
+TEST_LINKS_TO  = %{link_to_botan} $(LIB_LINKS_TO)
 
 LIB_FLAGS      = $(SO_OBJ_FLAGS) $(CXXFLAGS) $(WARN_FLAGS)
 CLI_FLAGS      = $(CXXFLAGS) $(WARN_FLAGS)
diff --git a/src/build-data/os/llvm.txt b/src/build-data/os/llvm.txt
new file mode 100644
index 000000000..119d641e4
--- /dev/null
+++ b/src/build-data/os/llvm.txt
@@ -0,0 +1,9 @@
+
+obj_suffix bc
+building_shared_supported no
+
+ar_command "llvm-link -o"
+
+<target_features>
+filesystem
+</target_features>