[Glibc-bsd-commits] r5894 - trunk/freebsd-buildutils/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-03-05 01:58:05 +0000 (Sat, 05 Mar 2016)
New Revision: 5894

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/rules
Log:
Actually use the proper build architecture compiler


Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2016-03-05 01:40:20 UTC (rev 5893)
+++ trunk/freebsd-buildutils/debian/changelog	2016-03-05 01:58:05 UTC (rev 5894)
@@ -3,6 +3,7 @@
   * New upstream snapshot of 10.3-RC1
   * Mark freebsd-mk as Multi-Arch: foreign (thanks, Helmut Grohne!)
   * Map Debian's kfreebsd-armhf to FreeBSD's armv6 MACHINE_ARCH
+  * Actually use the proper build architecture compiler
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Sat, 05 Mar 2016 00:27:01 +0000
 

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2016-03-05 01:40:20 UTC (rev 5893)
+++ trunk/freebsd-buildutils/debian/rules	2016-03-05 01:58:05 UTC (rev 5894)
@@ -5,6 +5,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# Determine host architecture compiler
+DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ifeq ($(origin CC),default)
+CC := $(DEB_HOST_GNU_TYPE)-gcc
+endif
+
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_BUILD_GNU_TYPE	:= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -73,7 +79,7 @@
 	-D_GNU_SOURCE=1 -isystem /usr/include/freebsd
 # disabled due to #630907 (see also 20_libbsd_overlay.diff)
 # $(shell pkg-config --cflags libbsd-overlay)
-MAKE_BUILD_FLAGS = CC=gcc NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
+MAKE_BUILD_FLAGS = CC=$(CC) NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
 
 PMAKE_FLAGS = -m $(CURDIR)/src/share/mk
 PMAKE = \