Port bug 818061 - Fallback to systems default clang if CC/CXX is not set. r=bustage-fix for make check-sync-dirs failure.
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 06 Dec 2012 19:02:44 +0000
changeset 15107 c8b42073433727a96f887ee687084aff9d9a087a
parent 15106 1fbd802f8ebd1f6781d034b6501b6e0f5147a06b
child 15108 8adf2847959205bf3d36eb5726706a0775fbbf36
push id441
push userarchaeopteryx@coole-files.de
push dateSun, 09 Dec 2012 20:12:48 +0000
treeherdertry-comm-central@c05548089b51 [default view] [failures only]
reviewersbustage-fix
bugs818061
Port bug 818061 - Fallback to systems default clang if CC/CXX is not set. r=bustage-fix for make check-sync-dirs failure.
build/macosx/mozconfig.common
--- a/build/macosx/mozconfig.common
+++ b/build/macosx/mozconfig.common
@@ -8,9 +8,20 @@ if [ -d "$topsrcdir/clang" ]; then
     # mozilla-central based build
     export CC=$topsrcdir/clang/bin/clang
     export CXX=$topsrcdir/clang/bin/clang++
 elif [ -d "$topsrcdir/../clang" ]; then
     # comm-central based build
     export CC=$topsrcdir/../clang/bin/clang
     export CXX=$topsrcdir/../clang/bin/clang++
 fi
+
+# If not set use the system default clang
+if [ -z "$CC" ]; then
+    export CC=clang
+fi
+
+# If not set use the system default clang++
+if [ -z "$CXX" ]; then
+    export CXX=clang++
+fi
+
 ac_add_options --with-ccache