chiark / gitweb /
Honour dpkg-architecture's DEB_HOST_GNU_TYPE, to fix cross-building.
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 24 Jan 2017 14:20:27 +0000 (14:20 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 24 Jan 2017 14:26:35 +0000 (14:26 +0000)
debian/changelog
debian/rules

index 217cc5a..706198f 100644 (file)
@@ -8,6 +8,7 @@ chiark-tcl (1.1.4~~iwj) UNRELEASED; urgency=low
     this change fixes the FTBFS on Debian hurd-* and kfreebsd-*.
   * Update build-dependencies to permit tcl8.6.  Closes:#818475.
   * Replace ad-hocery with use of offsetof/typeof.  Closes:#812718.
     this change fixes the FTBFS on Debian hurd-* and kfreebsd-*.
   * Update build-dependencies to permit tcl8.6.  Closes:#818475.
   * Replace ad-hocery with use of offsetof/typeof.  Closes:#812718.
+  * Honour dpkg-architecture's DEB_HOST_GNU_TYPE, to fix cross-building.
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 24 Jan 2017 13:14:06 +0000
 
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 24 Jan 2017 13:14:06 +0000
 
index faa763a..f5d4a2a 100755 (executable)
@@ -26,6 +26,15 @@ docdir=usr/share/doc/$(docpackage)
 tclh:=$(firstword $(wildcard /usr/include/tcl8.*/tcl.h))
 tclversion:=$(patsubst /usr/include/tcl%/tcl.h,%,$(tclh))
 
 tclh:=$(firstword $(wildcard /usr/include/tcl8.*/tcl.h))
 tclversion:=$(patsubst /usr/include/tcl%/tcl.h,%,$(tclh))
 
+garch := $(shell dpkg-architecture -q DEB_HOST_GNU_TYPE)
+ifneq ($(garch),)
+
+ifeq ($(origin CC),default)
+export CC=$(garch)-gcc
+endif
+
+endif # $garch
+
 define checkdir
        test -f hbytes/hbytes.tct
 endef
 define checkdir
        test -f hbytes/hbytes.tct
 endef