- Fix CC / CXX environment variable detection n build-mg.sh

- gitignore build-mg.sh's build/ at the new location
This commit is contained in:
Tom Reynolds 2014-01-22 19:17:01 +01:00
parent 1bd772a4f3
commit 87aa45ef81
2 changed files with 2 additions and 2 deletions

2
.gitignore vendored
View File

@ -56,7 +56,7 @@ $RECYCLE.BIN/
*.blend
*.blend1
# Linux_build
/build/
/mk/linux/build/
/google-breakpad
/mk/linux/megaglest.6
# Windows_build

View File

@ -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