File tree 1 file changed +12
-10
lines changed 1 file changed +12
-10
lines changed Original file line number Diff line number Diff line change @@ -861,16 +861,6 @@ then
861
861
CFG_DISABLE_JEMALLOC=1
862
862
fi
863
863
864
- if [ $CFG_OSTYPE = unknown-freebsd ]
865
- then
866
- CFG_FREEBSD_GCC_VERSION=$( " CFG_GCC" --version 2>&1 )
867
- if [ $? -ne 0 ]
868
- then
869
- step_msg " GCC not installed on FreeBSD, forcing clang"
870
- CFG_ENABLE_CLANG=1
871
- fi
872
- fi
873
-
874
864
# OS X 10.9, gcc is actually clang. This can cause some confusion in the build
875
865
# system, so if we find that gcc is clang, we should just use clang directly.
876
866
if [ $CFG_OSTYPE = apple-darwin -a -z " $CFG_ENABLE_CLANG " ]
@@ -909,6 +899,18 @@ then
909
899
fi
910
900
fi
911
901
902
+ # If the clang isn't already enabled, check for GCC, and if it is missing, turn
903
+ # on clang as a backup.
904
+ if [ -z " $CFG_ENABLE_CLANG " ]
905
+ then
906
+ CFG_GCC_VERSION=$( " CFG_GCC" --version 2>&1 )
907
+ if [ $? -ne 0 ]
908
+ then
909
+ step_msg " GCC not installed, will try using Clang"
910
+ CFG_ENABLE_CLANG=1
911
+ fi
912
+ fi
913
+
912
914
# Okay, at this point, we have made up our minds about whether we are
913
915
# going to force CFG_ENABLE_CLANG or not; save the setting if so.
914
916
if [ ! -z " $CFG_ENABLE_CLANG " ]
You can’t perform that action at this time.
0 commit comments