clang: support for building elf using temporary elf-targeted binutils.

diff --git a/lib/Makefile b/lib/Makefile
index 80e1baa05c5fcfc7582d63c8ece03bb0a85136bb..a0a2561e98379e3b77e6f81959cc5007bb26706f 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -34,3 +34,6 @@ clean_gnu:
 
 clean_elf:
        sh elf_build.sh clean
+
+clean_clang:
+       sh clang_build.sh clean

diff --git a/lib/clang_build.sh b/lib/clang_build.sh
index 201708b03efab161a954afb916cc6eb589d53f8d..15939133fc434cc046da57179e73845a9dbd8b51 100755 (executable)
--- a/lib/clang_build.sh
+++ b/lib/clang_build.sh
@@ -2,7 +2,12 @@
 
 export CC=clang
 export COMPILER_TYPE=gnu
+export LD="i386-pc-minix3-ld"
+export AR="i386-pc-minix3-ar"
+export OBJCOPY="i386-pc-minix3-objcopy"
+export RANLIB="i386-pc-minix3-ranlib"
 export MAKEOBJDIR=obj-gnu
-export PATH=$PATH:/usr/pkg/bin
+export PATH=$PATH:/usr/pkg/bin:/usr/gnu_cross/bin
+export MAKEOBJDIR=obj-elf-clang
 
 make $@

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 724ebdf26f36d14460681ac78181a0f1b8409a12..975bffce6ec10850222beffcd78165da10625837 100644 (file)
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -535,7 +535,7 @@ DEBUGMODE?= ${NONBINMODE}
 # All platforms are ELF.
 #
 #OBJECT_FMT=   ELF
-.if !empty(CC:Mi386-pc-minix3-gcc)
+.if !empty(CC:Mi386-pc-minix3-gcc) || !empty(CC:Mclang)
 OBJECT_FMT=    ELF
 .else
 OBJECT_FMT=    a.out