[Glibc-bsd-commits] r5885 - trunk/freebsd-glue/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-03-05 00:55:49 +0000 (Sat, 05 Mar 2016)
New Revision: 5885

Modified:
   trunk/freebsd-glue/debian/rules
Log:
Actually use the proper build architecture compiler
(thanks, Helmut Grohne!)


Modified: trunk/freebsd-glue/debian/rules
===================================================================
--- trunk/freebsd-glue/debian/rules	2016-03-05 00:52:41 UTC (rev 5884)
+++ trunk/freebsd-glue/debian/rules	2016-03-05 00:55:49 UTC (rev 5885)
@@ -1,6 +1,18 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+DEB_HOST_ARCH_OS	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+# 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
+
+# Determine build architecture compiler
+DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+NATIVE_CC		?= $(DEB_BUILD_GNU_TYPE)-gcc
+
 export SHELL = bash
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -18,6 +30,7 @@
 	CFLAGS="$(CFLAGS) -O2" \
 	DESTDIR="$(DESTDIR)" \
 	bmake -m /usr/share/mk-freebsd \
+	CC=$(CC) \
 	$(NULL)
 PMAKE_UDEB := \
 	MAKEFLAGS=$(BSD_MAKEFLAGS) \
@@ -25,21 +38,10 @@
 	CFLAGS="$(CFLAGS) -Os" \
 	DESTDIR="$(DESTDIR)-udeb" \
 	bmake -m /usr/share/mk-freebsd \
+	CC=$(CC) \
 	RESCUE=yes \
 	$(NULL)
 
-DEB_HOST_ARCH_OS	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
-# 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
-
-# Determine build architecture compiler
-DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-NATIVE_CC		?= $(DEB_BUILD_GNU_TYPE)-gcc
-
 clean:
 	dh_testdir
 	rm -rf obj-{deb,udeb} debian/tmp-udeb