From: Arun Thomas Date: Wed, 29 Jun 2011 08:32:37 +0000 (+0200) Subject: GCC build option for elf libs and usr.bin X-Git-Tag: v3.2.0~509 X-Git-Url: http://zhaoyanbai.com/repos/%22../static/icons/mdoc.3.ps?a=commitdiff_plain;h=5971d0532c1a7be66796eda248454e008324967e;p=minix.git GCC build option for elf libs and usr.bin --- diff --git a/docs/UPDATING b/docs/UPDATING index fc5cbd4b1..ff539f21f 100644 --- a/docs/UPDATING +++ b/docs/UPDATING @@ -3,8 +3,8 @@ make -C usr.bin/m4 install 20110629: - You must install clang. It is now used to build some of - the userland utilities. + You must install clang. By default, it is used to build the + elf libraries and some userland utilities. 20110628: Since buildworld will also build the elf-libraries, you diff --git a/lib/elf_build.sh b/lib/elf_build.sh index b0cf857ee..6b03019af 100755 --- a/lib/elf_build.sh +++ b/lib/elf_build.sh @@ -2,7 +2,7 @@ set -e -export CC=clang +export CC=${CC:-clang} export COMPILER_TYPE=gnu export PATH=$PATH:/usr/pkg/bin diff --git a/lib/libelf/Makefile b/lib/libelf/Makefile index 04425708c..8534a8881 100644 --- a/lib/libelf/Makefile +++ b/lib/libelf/Makefile @@ -1,8 +1,8 @@ # $Id$ -# Requires clang and NBSD_LIBC +# Requires NBSD_LIBC and clang/gcc (we default to using clang) NBSD_LIBC:= yes -CC:= clang +CC:=${CC:C/^cc/clang/} COMPILER_TYPE:= gnu LIB= elf diff --git a/usr.bin/Makefile.inc b/usr.bin/Makefile.inc index ef03e0ef1..9b4467498 100644 --- a/usr.bin/Makefile.inc +++ b/usr.bin/Makefile.inc @@ -1,6 +1,6 @@ -# Require clang and NBSD_LIBC +# Requires NBSD_LIBC and clang/gcc (we default to using clang) NBSD_LIBC:= yes -CC:= clang +CC:=${CC:C/^cc/clang/} COMPILER_TYPE:= gnu CPPFLAGS+= -D_NETBSD_SOURCE