From 87aa45ef819f8de65acb3dad53d31a0056a7a75c Mon Sep 17 00:00:00 2001 From: Tom Reynolds Date: Wed, 22 Jan 2014 19:17:01 +0100 Subject: [PATCH] - Fix CC / CXX environment variable detection n build-mg.sh - gitignore build-mg.sh's build/ at the new location --- .gitignore | 2 +- mk/linux/build-mg.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9901bc2c..806a1ac8 100644 --- a/.gitignore +++ b/.gitignore @@ -56,7 +56,7 @@ $RECYCLE.BIN/ *.blend *.blend1 # Linux_build -/build/ +/mk/linux/build/ /google-breakpad /mk/linux/megaglest.6 # Windows_build diff --git a/mk/linux/build-mg.sh b/mk/linux/build-mg.sh index 8c1bc6f2..726fe734 100755 --- a/mk/linux/build-mg.sh +++ b/mk/linux/build-mg.sh @@ -173,7 +173,7 @@ if [ $CLANG_FORCED = 1 ]; then #exit 1; # If both the $CC and $CXX environment variable point to something containing # "clang", use whatever these environment variables point to. -elif [ "`echo $CC | grep -Fq 'clang'`" = 'clang' -a "`echo $CXX | grep -Fq 'clang'`" = 'clang' ]; then +elif [ "`echo $CC | grep -oF 'clang'`" = 'clang' -a "`echo $CXX | grep -oF 'clang'`" = 'clang' ]; then if [ `echo $CC | grep -Fq '/'` = '/' ]; then CLANG_CC=$CC else