- 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:
parent
1bd772a4f3
commit
87aa45ef81
|
@ -56,7 +56,7 @@ $RECYCLE.BIN/
|
||||||
*.blend
|
*.blend
|
||||||
*.blend1
|
*.blend1
|
||||||
# Linux_build
|
# Linux_build
|
||||||
/build/
|
/mk/linux/build/
|
||||||
/google-breakpad
|
/google-breakpad
|
||||||
/mk/linux/megaglest.6
|
/mk/linux/megaglest.6
|
||||||
# Windows_build
|
# Windows_build
|
||||||
|
|
|
@ -173,7 +173,7 @@ if [ $CLANG_FORCED = 1 ]; then
|
||||||
#exit 1;
|
#exit 1;
|
||||||
# If both the $CC and $CXX environment variable point to something containing
|
# If both the $CC and $CXX environment variable point to something containing
|
||||||
# "clang", use whatever these environment variables point to.
|
# "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
|
if [ `echo $CC | grep -Fq '/'` = '/' ]; then
|
||||||
CLANG_CC=$CC
|
CLANG_CC=$CC
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue