15 files changed, 44 insertions, 28 deletions
diff --git a/src/build-data/cc/bcc.txt b/src/build-data/cc/bcc.txt
index fe88c270e..4315c379f 100644
--- a/src/build-data/cc/bcc.txt
+++ b/src/build-data/cc/bcc.txt
@@ -1,5 +1,3 @@
-realname "Borland C++"
-
 macro_name "BORLAND"
 
 binary_name "bcc32"
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
new file mode 100644
index 000000000..18f3580ce
--- /dev/null
+++ b/src/build-data/cc/clang.txt
@@ -0,0 +1,44 @@
+# Largely copied from the gcc config
+
+macro_name "CLANG"
+
+binary_name clang
+
+compile_option "-c "
+output_to_option "-o "
+add_include_dir_option "-I"
+add_lib_dir_option "-L"
+add_lib_option "-l"
+
+lang_flags "-D_REENTRANT -ansi -Wno-long-long"
+warning_flags "-W -Wall"
+
+makefile_style unix
+
+lib_opt_flags "-O2"
+check_opt_flags "-O2"
+shared_flags "-fPIC"
+debug_flags "-g"
+no_debug_flags "-finline-functions"
+
+<so_link_flags>
+# The default works for GNU ld and several other Unix linkers
+default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)"
+</so_link_flags>
+
+<mach_abi_linking>
+amd64   -> "-m64"
+mips64  -> "-mabi=64"
+s390    -> "-m31"
+s390x   -> "-m64"
+sparc32 -> "-m32 -mno-app-regs"
+sparc64 -> "-m64 -mno-app-regs"
+ppc64   -> "-m64"
+
+# This should probably be used on most/all targets, but the docs are incomplete
+openbsd -> "-pthread"
+freebsd -> "-pthread"
+dragonfly -> "-pthread"
+netbsd  -> "-pthread -D_NETBSD_SOURCE"
+qnx     -> "-fexceptions -D_QNX_SOURCE"
+</mach_abi_linking>
diff --git a/src/build-data/cc/compaq.txt b/src/build-data/cc/compaq.txt
index 94075e888..9ad6514ab 100644
--- a/src/build-data/cc/compaq.txt
+++ b/src/build-data/cc/compaq.txt
@@ -1,5 +1,3 @@
-realname "Compaq C++"
-
 macro_name "COMPAQ"
 
 binary_name "cxx"
diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt
index 38516e2f3..ecd813629 100644
--- a/src/build-data/cc/ekopath.txt
+++ b/src/build-data/cc/ekopath.txt
@@ -1,5 +1,3 @@
-realname "PathScale EKOPath C++"
-
 macro_name "PATHSCALE"
 
 binary_name "pathCC"
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 47b0390f6..724316690 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -1,5 +1,3 @@
-realname "GNU C++"
-
 macro_name "GCC"
 
 binary_name "g++-4.4.1"
diff --git a/src/build-data/cc/hpcc.txt b/src/build-data/cc/hpcc.txt
index 9c0d4a784..5bde87de9 100644
--- a/src/build-data/cc/hpcc.txt
+++ b/src/build-data/cc/hpcc.txt
@@ -1,5 +1,3 @@
-realname "HP-UX C++"
-
 macro_name "HP_ACC"
 
 binary_name "aCC"
diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt
index 9595714f6..628a59e2d 100644
--- a/src/build-data/cc/icc.txt
+++ b/src/build-data/cc/icc.txt
@@ -1,5 +1,3 @@
-realname "Intel C++"
-
 macro_name "INTEL"
 
 binary_name "icpc"
diff --git a/src/build-data/cc/kai.txt b/src/build-data/cc/kai.txt
index 52ddba4ab..d0ff1c28a 100644
--- a/src/build-data/cc/kai.txt
+++ b/src/build-data/cc/kai.txt
@@ -1,5 +1,3 @@
-realname "KAI C++"
-
 macro_name "KAI"
 
 binary_name "KCC"
diff --git a/src/build-data/cc/mipspro.txt b/src/build-data/cc/mipspro.txt
index a4cfbd1ee..c518f4c26 100644
--- a/src/build-data/cc/mipspro.txt
+++ b/src/build-data/cc/mipspro.txt
@@ -1,5 +1,3 @@
-realname "SGI MIPSPro C++"
-
 macro_name "MIPSPRO"
 
 binary_name "CC"
diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt
index c19d93e2b..603ea449b 100644
--- a/src/build-data/cc/msvc.txt
+++ b/src/build-data/cc/msvc.txt
@@ -1,5 +1,3 @@
-realname "Visual C++"
-
 macro_name "MSVC"
 
 binary_name "cl.exe"
diff --git a/src/build-data/cc/open64.txt b/src/build-data/cc/open64.txt
index 0157440cf..e794c755e 100644
--- a/src/build-data/cc/open64.txt
+++ b/src/build-data/cc/open64.txt
@@ -1,5 +1,3 @@
-realname "Open64"
-
 macro_name "OPEN64"
 
 binary_name "openCC"
diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt
index c4fdb9e70..a6d2416ab 100644
--- a/src/build-data/cc/pgi.txt
+++ b/src/build-data/cc/pgi.txt
@@ -1,5 +1,3 @@
-realname "Portland Group C++"
-
 macro_name "PORTLAND_GROUP"
 
 binary_name "pgCC"
diff --git a/src/build-data/cc/sgipro64.txt b/src/build-data/cc/sgipro64.txt
index be91ac69a..073f2fec0 100644
--- a/src/build-data/cc/sgipro64.txt
+++ b/src/build-data/cc/sgipro64.txt
@@ -1,5 +1,3 @@
-realname "SGI Pro64"
-
 macro_name "SGI_PRO64"
 
 binary_name "sgiCC"
diff --git a/src/build-data/cc/sunwspro.txt b/src/build-data/cc/sunwspro.txt
index 9756f8538..7065d4129 100644
--- a/src/build-data/cc/sunwspro.txt
+++ b/src/build-data/cc/sunwspro.txt
@@ -1,5 +1,3 @@
-realname "Sun Workshop Pro C++"
-
 macro_name "SUN_WORKSHOP"
 
 binary_name "CC"
diff --git a/src/build-data/cc/xlc.txt b/src/build-data/cc/xlc.txt
index 6d06b4c43..521624395 100644
--- a/src/build-data/cc/xlc.txt
+++ b/src/build-data/cc/xlc.txt
@@ -1,5 +1,3 @@
-realname "IBM XL C/C++"
-
 macro_name "IBM_XLC"
 
 binary_name "xlC"