[Glibc-bsd-commits] r5870 - trunk/kfreebsd-11/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-02-06 17:32:12 +0000 (Sat, 06 Feb 2016)
New Revision: 5870

Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/rules
Log:
Change Build-Depends from clang-3.6 to clang-3.7, to match upstream


Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2016-02-06 17:23:26 UTC (rev 5869)
+++ trunk/kfreebsd-11/debian/changelog	2016-02-06 17:32:12 UTC (rev 5870)
@@ -22,6 +22,7 @@
     - 930_freebsd_cc.diff
     - 940_ld_verbose.diff
     - 999_config.diff
+  * Change Build-Depends from clang-3.6 to clang-3.7, to match upstream
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Sat, 06 Feb 2016 16:17:19 +0000
 

Modified: trunk/kfreebsd-11/debian/rules
===================================================================
--- trunk/kfreebsd-11/debian/rules	2016-02-06 17:23:26 UTC (rev 5869)
+++ trunk/kfreebsd-11/debian/rules	2016-02-06 17:32:12 UTC (rev 5870)
@@ -67,15 +67,15 @@
 # Clang is the default compiler on these architectures (see src/share/mk/src.opts.mk)
 clang_cpus	:= i386 amd64 arm
 
-ifeq (, $(filter 3.6.%, $(clang_version)))
+ifeq (, $(filter 3.7.%, $(clang_version)))
 $(error Upstream is now using a different Clang version than we expected. Consider updating cc_pkg and cc_cmd)
 endif
 
-cc_pkg		:= clang-3.6 [$(foreach cpu,$(clang_cpus),any-$(cpu))], \
+cc_pkg		:= clang-3.7 [$(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-3.6
+cc_cmd		:= clang-3.7
 else
 cc_cmd		:= gcc-4.8
 endif
@@ -83,7 +83,7 @@
 ifneq (, $(filter clang-%, $(cc_cmd)))
 MAKE	+= -DWITH_CLANG_IS_CC
 MAKE	+= COMPILER_TYPE=clang
-MAKE	+= COMPILER_VERSION=30601
+MAKE	+= COMPILER_VERSION=30701
 else
 MAKE	+= -DWITHOUT_CLANG_IS_CC
 MAKE	+= COMPILER_TYPE=gcc