[lmi-commits] [lmi] master 7448016 5/5: Make host type configurable

[Greg Chicares]

branch: master
commit 7448016e3b779aa7b198663c306dca03f11f1dff
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Make host type configurable
    
    Incidentally:
    
    * install_libxml2_libxslt.make: Wrote $(build_dir) in terms of $(prefix)
    as is already done for the wx libraries.
    * install_wx.sh: Replaced duplicative "gcc" in $vendor with $host_type.
---
 install_libxml2_libxslt.make | 6 +++---
 install_wx.sh                | 5 +++--
 install_wxpdfdoc.sh          | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/install_libxml2_libxslt.make b/install_libxml2_libxslt.make
index 6be5930..2dfe4d4 100644
--- a/install_libxml2_libxslt.make
+++ b/install_libxml2_libxslt.make
@@ -48,23 +48,23 @@ $(xz_version).tar.gz: host_path := projects/lzmautils/files
 
 mingw_dir     := /MinGW_
 
+host_type     := $(if $(LMI_HOST),$(LMI_HOST),i686-w64-mingw32)
+
 prefix        := /opt/lmi/local
 exec_prefix   := $(prefix)
 
 cache_dir     := /cache_for_lmi/downloads
 
-build_dir     := /opt/lmi/xml-ad_hoc
+build_dir     := $(prefix)/../xml-ad_hoc
 
 # Variables that normally should be left alone 
#################################
 
 mingw_bin_dir :=
-host_type     := i686-w64-mingw32
 
 lmi_build_type := $(shell /usr/share/libtool/build-aux/config.guess)
 
 ifeq (cygwin,$(findstring cygwin,$(lmi_build_type)))
   mingw_bin_dir := $(mingw_dir)/bin/
-  host_type     := i686-w64-mingw32
 endif
 
 xz_cflags := \
diff --git a/install_wx.sh b/install_wx.sh
index 88cf9ce..f3a1e66 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -41,6 +41,8 @@ coefficiency=${coefficiency:-"--jobs=4"}
 
 MAKE=${MAKE:-"make $coefficiency"}
 
+host_type=${LMI_HOST:-"i686-w64-mingw32"}
+
 # Variables that normally should be left alone 
#################################
 
 mingw_dir=/MinGW_
@@ -78,7 +80,6 @@ git checkout "$wx_commit_sha"
 git submodule update "$coefficiency" --recursive --init
 
 build_type=$("$proxy_wx_dir"/config.guess)
-host_type=i686-w64-mingw32
 
 case "$build_type" in
     (*-*-cygwin*)
@@ -89,7 +90,7 @@ esac
 # Construct a vendor string for this build using the compiler name and version
 # and the unique commit SHA-1.
 gcc_version=$(${mingw_bin_dir}${host_type}-gcc -dumpversion|tr -d '\r')
-vendor=gcc-$gcc_version-$wx_commit_sha
+vendor=${host_type}-$gcc_version-$wx_commit_sha
 
 # Configuration reference:
 #   http://lists.nongnu.org/archive/html/lmi/2007-11/msg00001.html
diff --git a/install_wxpdfdoc.sh b/install_wxpdfdoc.sh
index fe1721e..d01ed40 100755
--- a/install_wxpdfdoc.sh
+++ b/install_wxpdfdoc.sh
@@ -41,6 +41,8 @@ coefficiency=${coefficiency:-"--jobs=4"}
 
 MAKE=${MAKE:-"make $coefficiency"}
 
+host_type=${LMI_HOST:-"i686-w64-mingw32"}
+
 # Variables that normally should be left alone 
#################################
 
 mingw_dir=/MinGW_
@@ -75,7 +77,6 @@ fi
 git checkout "$wxpdfdoc_commit_sha"
 
 build_type=$("$proxy_wxpdfdoc_dir"/admin/build-aux/config.guess)
-host_type=i686-w64-mingw32
 
 case "$build_type" in
     (*-*-cygwin*)