aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2011-11-15 18:34:17 +0000
committerDaniel Dunbar <daniel@zuster.org>2011-11-15 18:34:17 +0000
commitfdb75e40ae973fbd7d6aad3a5b62dba1d66cb538 (patch)
tree5e756f6bbcfdfd642221d48a2c37c89c962a5ad1
parentbe6535b3dca5c5af4ef83c7a2c4fcd941d2bd4b2 (diff)
downloadllvm-fdb75e40ae973fbd7d6aad3a5b62dba1d66cb538.zip
llvm-fdb75e40ae973fbd7d6aad3a5b62dba1d66cb538.tar.gz
llvm-fdb75e40ae973fbd7d6aad3a5b62dba1d66cb538.tar.bz2
build: Change default CC to be clang instead of gcc.
llvm-svn: 144658
-rw-r--r--compiler-rt/make/platform/clang_darwin.mk2
-rw-r--r--compiler-rt/make/platform/darwin_fat.mk2
-rw-r--r--compiler-rt/make/platform/multi_arch.mk3
3 files changed, 3 insertions, 4 deletions
diff --git a/compiler-rt/make/platform/clang_darwin.mk b/compiler-rt/make/platform/clang_darwin.mk
index b3d36f8..8011d9c 100644
--- a/compiler-rt/make/platform/clang_darwin.mk
+++ b/compiler-rt/make/platform/clang_darwin.mk
@@ -67,7 +67,7 @@ endif
###
-CC := gcc
+CC := clang
# Forcibly strip off any -arch, as that totally breaks our universal support.
override CC := $(subst -arch ,-arch_,$(CC))
diff --git a/compiler-rt/make/platform/darwin_fat.mk b/compiler-rt/make/platform/darwin_fat.mk
index 30e57a1..f9ec4c3 100644
--- a/compiler-rt/make/platform/darwin_fat.mk
+++ b/compiler-rt/make/platform/darwin_fat.mk
@@ -37,7 +37,7 @@ UniversalArchs := i386 ppc x86_64
# <Option Name>.<Arch Name> := ...
# <Option Name>.<Config Name>.<Arch Name> := ...
-CC := gcc
+CC := clang
CFLAGS := -Wall -Werror
CFLAGS.Debug := $(CFLAGS) -g
diff --git a/compiler-rt/make/platform/multi_arch.mk b/compiler-rt/make/platform/multi_arch.mk
index eebc7b2..fe6ac4b 100644
--- a/compiler-rt/make/platform/multi_arch.mk
+++ b/compiler-rt/make/platform/multi_arch.mk
@@ -5,8 +5,7 @@ Configs := m32 m64
Arch := i386
Arch.m64 := x86_64
-CC := gcc
-CC.m32 := clang
+CC := clang
CFLAGS := -Wall -Werror
CFLAGS.m32 := $(CFLAGS) -m32 -O3