From fb6d7f987507874469de6d72ababecbeccab7d2a Mon Sep 17 00:00:00 2001 From: don bright Date: Mon, 24 Dec 2012 19:44:43 -0600 Subject: fix clang build on glew. add some documentation. diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh index a7c62d2..6384148 100755 --- a/scripts/uni-build-dependencies.sh +++ b/scripts/uni-build-dependencies.sh @@ -242,7 +242,7 @@ build_glew() # clang linux if [ $CC ]; then - sed -ibak s/"CC = cc"/"CC = $(CC)"/ config/Makefile.linux + sed -ibak s/"CC = cc"/"# CC = cc"/ config/Makefile.linux fi MAKER=make @@ -350,6 +350,9 @@ build_eigen() } +# this section allows 'out of tree' builds, as long as the system has +# the 'dirname' command installed + if [ "`command -v dirname`" ]; then OPENSCAD_SCRIPTDIR=`dirname $0` else @@ -379,6 +382,9 @@ echo "Using srcdir:" $SRCDIR echo "Number of CPUs for parallel builds:" $NUMCPU mkdir -p $SRCDIR $DEPLOYDIR +# this section builds some basic tools, if they are missing or outdated +# they are installed under $BASEDIR/bin which we have added to our PATH + if [ ! "`command -v curl`" ]; then build_curl 7.26.0 fi -- cgit v0.10.1