From 9c38253d1d8bae2f821d30fb8216783d2eb76f87 Mon Sep 17 00:00:00 2001 From: Francis Conti Date: Tue, 13 Nov 2018 21:23:40 -0800 Subject: INSTALL: fix compiler detection on FreeBSD+clang (#177) --- INSTALL | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) (limited to 'INSTALL') diff --git a/INSTALL b/INSTALL index 4673056b..282f900c 100755 --- a/INSTALL +++ b/INSTALL @@ -15,9 +15,9 @@ x-c) doinstall=true ;; x-r) - shift - PLAN9_TARGET=$1 export PLAN9_TARGET - ;; + shift + PLAN9_TARGET=$1 export PLAN9_TARGET + ;; *) echo 'usage: INSTALL [-b | -c] [-r path]' 1>&2 exit 1 @@ -42,23 +42,27 @@ echo "* Resetting $PLAN9/config" rm -f config ( -echo "* Compiler version:" -9c -v 2>&1 | grep -v 'Configured with:' | grep -i version | sed 's/^/ /' - if [ `uname` = FreeBSD ]; then - echo "* Running on FreeBSD, adjusting linker flags" - echo "LDFLAGS='-L/usr/local/lib'" >> $PLAN9/config + case `cc -v 2>&1` in + *clang*) + echo "CC9=clang" >> $PLAN9/config + ;; + *) + ;; + esac + echo "* Running on FreeBSD, adjusting linker flags" + echo "LDFLAGS='-L/usr/local/lib'" >> $PLAN9/config fi if [ `uname` = DragonFly ]; then - echo "* Running on DragonFly BSD, adjusting linker flags" - echo "LDFLAGS='-L/usr/local/lib -pthread'" >> $PLAN9/config - echo "CFLAGS='-pthread'" >> $PLAN9/config + echo "* Running on DragonFly BSD, adjusting linker flags" + echo "LDFLAGS='-L/usr/local/lib -pthread'" >> $PLAN9/config + echo "CFLAGS='-pthread'" >> $PLAN9/config fi if [ `uname` = OpenBSD ]; then - echo "* Running on OpenBSD, adjusting linker flags" - echo "LDFLAGS='-L/usr/X11R6/lib -pthread'" >> $PLAN9/config + echo "* Running on OpenBSD, adjusting linker flags" + echo "LDFLAGS='-L/usr/X11R6/lib -pthread'" >> $PLAN9/config fi if [ `uname` = Linux ]; then @@ -80,8 +84,8 @@ fi if [ `uname` = SunOS ]; then # On Solaris x86, uname -p cannot be trusted. - echo "* Running on Solaris: checking architecture..." - case "$(isainfo -n)" in + echo "* Running on Solaris: checking architecture..." + case "$(isainfo -n)" in *amd64*) echo " x86-64 found." echo "OBJTYPE=x86_64" >>$PLAN9/config @@ -92,7 +96,7 @@ if [ `uname` = SunOS ]; then echo "OBJTYPE=386" >>$PLAN9/config echo "CC9=gcc" >>$PLAN9/config # defaults to gcc on Solaris/i386 ;; - *sparc*) + *sparc*) echo " Sparc found." echo "OBJTYPE=sparc" >>$PLAN9/config ;; @@ -118,7 +122,7 @@ if [ `uname` = Darwin ]; then echo "OBJTYPE=386" >>$PLAN9/config ;; *ppc*) - echo " power found." + echo " power found." echo "OBJTYPE=power" >>$PLAN9/config ;; esac @@ -147,6 +151,9 @@ if [ -f LOCAL.config ]; then cat LOCAL.config >>config fi +echo "* Compiler version:" +9c -v 2>&1 | grep -v 'Configured with:' | grep -i version | sed 's/^/ /' + cd src if $dobuild; then if [ ! -x ../bin/mk ]; then -- cgit v1.2.3 From fe92b4a0b1a8268238bce088cd081da9b802b465 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Thu, 15 Nov 2018 20:34:32 -0500 Subject: INSTALL: set CC9 on macOS to use xcrun clang Using plain 'clang' does not work well for the new devdraw on macOS 10.14. But 'xcrun --sdk macosx clang' does work, for reasons no one understands. Hopefully this will be OK on all macOS systems. --- INSTALL | 1 + 1 file changed, 1 insertion(+) (limited to 'INSTALL') diff --git a/INSTALL b/INSTALL index 282f900c..bfb7f657 100755 --- a/INSTALL +++ b/INSTALL @@ -116,6 +116,7 @@ if [ `uname` = Darwin ]; then *x86_64*) echo " x86-64 found." echo "OBJTYPE=x86_64" >>$PLAN9/config + echo "CC9='xcrun --sdk macosx clang'" >>$PLAN9/config ;; *i386*) echo " i386 found." -- cgit v1.2.3 From ad2d49503b1242be501ab92832400ef344a6afae Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Fri, 16 Nov 2018 00:01:10 -0500 Subject: INSTALL: set $NPROC on macOS My MacBook Pro has hw.ncpu=12, so set NPROC=12. Speeds up INSTALL dramatically. Should probably add similar code to other OSes. Also silence rio warning from earlier commit. --- INSTALL | 1 + 1 file changed, 1 insertion(+) (limited to 'INSTALL') diff --git a/INSTALL b/INSTALL index bfb7f657..bfb0d5d7 100755 --- a/INSTALL +++ b/INSTALL @@ -104,6 +104,7 @@ if [ `uname` = SunOS ]; then fi if [ `uname` = Darwin ]; then + export NPROC=$(sysctl hw.ncpu | sed 's/hw.ncpu: //') # On Darwin, uname -m -p cannot be trusted. echo "* Running on Darwin: checking architecture..." rm -f ./a.out -- cgit v1.2.3 From 2607cc565ee3d5facb8949e9acfed35c8ae300c9 Mon Sep 17 00:00:00 2001 From: Xiao-Yong Date: Fri, 16 Nov 2018 09:14:49 -0600 Subject: INSTALL: use cc to check for fontsrv on non-Darwin (#203) FreeBSD 11.2 by default does not have gcc. --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'INSTALL') diff --git a/INSTALL b/INSTALL index bfb0d5d7..cb0df570 100755 --- a/INSTALL +++ b/INSTALL @@ -134,7 +134,7 @@ fi if [ `uname` != Darwin ]; then # Determine whether fontsrv X11 files are available. rm -f a.out - gcc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ + cc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1 if [ -f a.out ]; then echo " fontsrv dependencies found." -- cgit v1.2.3