From 76716a8e40d7c823836c5367e278573bff7a9c0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?=
 <respindola@mozilla.com>
Date: Wed, 18 Jul 2012 09:31:15 -0400
Subject: [PATCH] Bug 733905 - switch OS X builds to clang. r=ehsan.

---
 .../config/mozconfigs/macosx-universal/nightly |  1 -
 browser/config/mozconfigs/macosx32/debug       |  1 -
 browser/config/mozconfigs/macosx64/debug       |  1 -
 .../tooltool-manifests/macosx32/clang.manifest | 18 +++++++++++++++++-
 .../macosx32/releng.manifest                   | 18 +++++++++++++++++-
 .../macosx64/releng.manifest                   | 18 +++++++++++++++++-
 build/macosx/common                            |  4 ++--
 7 files changed, 53 insertions(+), 8 deletions(-)
 mode change 120000 => 100644 browser/config/tooltool-manifests/macosx32/clang.manifest

diff --git a/browser/config/mozconfigs/macosx-universal/nightly b/browser/config/mozconfigs/macosx-universal/nightly
index 4e782a0c109..43ed34512f5 100644
--- a/browser/config/mozconfigs/macosx-universal/nightly
+++ b/browser/config/mozconfigs/macosx-universal/nightly
@@ -23,7 +23,6 @@ ac_add_options --with-macbundlename-prefix=Firefox
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
-ac_add_options --with-ccache
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/config/mozconfigs/macosx32/debug b/browser/config/mozconfigs/macosx32/debug
index 840e6678f75..e3dcc5d4f86 100644
--- a/browser/config/mozconfigs/macosx32/debug
+++ b/browser/config/mozconfigs/macosx32/debug
@@ -11,7 +11,6 @@ mk_add_options MOZ_MAKE_FLAGS="-j12"
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --with-macbundlename-prefix=Firefox
-ac_add_options --with-ccache
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/config/mozconfigs/macosx64/debug b/browser/config/mozconfigs/macosx64/debug
index 9d53d7dca38..e4d015b8a74 100644
--- a/browser/config/mozconfigs/macosx64/debug
+++ b/browser/config/mozconfigs/macosx64/debug
@@ -16,7 +16,6 @@ ac_add_options --with-macbundlename-prefix=Firefox
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
-ac_add_options --with-ccache
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/config/tooltool-manifests/macosx32/clang.manifest b/browser/config/tooltool-manifests/macosx32/clang.manifest
deleted file mode 120000
index 3bb28c492ff..00000000000
--- a/browser/config/tooltool-manifests/macosx32/clang.manifest
+++ /dev/null
@@ -1 +0,0 @@
-../macosx64/clang.manifest
\ No newline at end of file
diff --git a/browser/config/tooltool-manifests/macosx32/clang.manifest b/browser/config/tooltool-manifests/macosx32/clang.manifest
new file mode 100644
index 00000000000..43a803b5926
--- /dev/null
+++ b/browser/config/tooltool-manifests/macosx32/clang.manifest
@@ -0,0 +1,17 @@
+[
+{
+"clang_version": "r160364"
+},
+{
+"size": 47,
+"digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa",
+"algorithm": "sha512",
+"filename": "setup.sh"
+},
+{
+"size": 54422251,
+"digest": "8208645d24ac87975a091ff66a90c20589ff8945936ed9b16ca81976c59bf1166ed9f79709698d435480774fba8ed9f9f178dc189305c86162acac8fda19830e",
+"algorithm": "sha512",
+"filename": "clang.tar.bz2"
+}
+]
diff --git a/browser/config/tooltool-manifests/macosx32/releng.manifest b/browser/config/tooltool-manifests/macosx32/releng.manifest
index fe51488c706..43a803b5926 100644
--- a/browser/config/tooltool-manifests/macosx32/releng.manifest
+++ b/browser/config/tooltool-manifests/macosx32/releng.manifest
@@ -1 +1,17 @@
-[]
+[
+{
+"clang_version": "r160364"
+},
+{
+"size": 47,
+"digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa",
+"algorithm": "sha512",
+"filename": "setup.sh"
+},
+{
+"size": 54422251,
+"digest": "8208645d24ac87975a091ff66a90c20589ff8945936ed9b16ca81976c59bf1166ed9f79709698d435480774fba8ed9f9f178dc189305c86162acac8fda19830e",
+"algorithm": "sha512",
+"filename": "clang.tar.bz2"
+}
+]
diff --git a/browser/config/tooltool-manifests/macosx64/releng.manifest b/browser/config/tooltool-manifests/macosx64/releng.manifest
index fe51488c706..43a803b5926 100644
--- a/browser/config/tooltool-manifests/macosx64/releng.manifest
+++ b/browser/config/tooltool-manifests/macosx64/releng.manifest
@@ -1 +1,17 @@
-[]
+[
+{
+"clang_version": "r160364"
+},
+{
+"size": 47,
+"digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa",
+"algorithm": "sha512",
+"filename": "setup.sh"
+},
+{
+"size": 54422251,
+"digest": "8208645d24ac87975a091ff66a90c20589ff8945936ed9b16ca81976c59bf1166ed9f79709698d435480774fba8ed9f9f178dc189305c86162acac8fda19830e",
+"algorithm": "sha512",
+"filename": "clang.tar.bz2"
+}
+]
diff --git a/build/macosx/common b/build/macosx/common
index b532039a234..c638f9a7249 100644
--- a/build/macosx/common
+++ b/build/macosx/common
@@ -1,4 +1,4 @@
-CC=/usr/bin/gcc-4.2
-CXX=/usr/bin/g++-4.2
+export CC=$topsrcdir/clang/bin/clang
+export CXX=$topsrcdir/clang/bin/clang++
 
 ac_add_options --enable-stdcxx-compat