[Glibc-bsd-commits] r4992 - trunk/kfreebsd-10/debian

[Robert Millan]

Author: rmh
Date: 2013-10-02 23:46:00 +0000 (Wed, 02 Oct 2013)
New Revision: 4992

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/rules
Log:
Only build with Clang on architectures where it is the default in upstream.

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2013-10-02 23:25:49 UTC (rev 4991)
+++ trunk/kfreebsd-10/debian/changelog	2013-10-02 23:46:00 UTC (rev 4992)
@@ -1,3 +1,10 @@
+kfreebsd-10 (10.0~svn255915-2) UNRELEASED; urgency=low
+
+  * Only build with Clang on architectures where it is the default in
+    upstream.
+
+ -- Robert Millan <rmh at debian.org>  Thu, 03 Oct 2013 01:45:47 +0200
+
 kfreebsd-10 (10.0~svn255915-1) experimental; urgency=low
 
   * New upstream snapshot.

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2013-10-02 23:25:49 UTC (rev 4991)
+++ trunk/kfreebsd-10/debian/rules	2013-10-02 23:46:00 UTC (rev 4992)
@@ -22,8 +22,6 @@
 configfile	:= DEBCUSTOM
 abiname		:= 0
 ld_target	:= $(shell ld --help | sed -ne "s/[^ :]*: supported targets: \([^ ]*\) .*/\1/p")
-cc_cmd		:= clang
-cc_pkg		:= clang-3.3 (>= 1:3.3-9)
 
 ifeq ($(cpu), mipsel)
 kfreebsd_cpu	:= mips
@@ -47,6 +45,18 @@
 MAKE		:= make MACHINE_ARCH=$(kfreebsd_cpu) -DWITHOUT_SOURCELESS
 PATH		:= /usr/lib/freebsd:$(PATH)
 
+# Clang is the default compiler on these architectures (see src/share/mk/bsd.own.mk)
+clang_cpus	:= i386 amd64 armel
+
+cc_pkg		:= clang-3.3 (>= 1:3.3-9) [$(foreach cpu,$(clang_cpus),any-$(cpu))], \
+		gcc-4.8 [$(foreach cpu,$(clang_cpus),!any-$(cpu))]
+
+ifneq (, $(filter $(clang_cpus), $(DEB_HOST_ARCH_CPU)))
+cc_cmd		:= clang
+else
+cc_cmd		:= gcc-4.8
+endif
+
 ifeq ($(cc_cmd), clang)
 MAKE	+= -DWITH_CLANG_IS_CC
 else