summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2018-11-22 04:20:59 -0500
committermidipix <writeonce@midipix.org>2018-11-22 04:35:36 -0500
commit299c71b509a0644c8028e78d77fbc3361644cc40 (patch)
treed971e194241ae9a904dc26ce101a385dba4cdc4d
parent46b4ff3ab29f41a634b1ddaae178f89505389b94 (diff)
downloadntapi-299c71b509a0644c8028e78d77fbc3361644cc40.tar.bz2
ntapi-299c71b509a0644c8028e78d77fbc3361644cc40.tar.xz
build system: added --cfghost support.
-rw-r--r--Makefile.in2
-rw-r--r--config.project1
-rw-r--r--config.usage2
-rwxr-xr-xconfigure14
4 files changed, 17 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index abe70c5..9ec7513 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,6 +18,7 @@ PKGLIBS = @pkglibs@
BUILD = @build@
HOST = @host@
CCHOST = @cchost@
+CFGHOST = @cfghost@
TARGET = @target@
ARCH = @arch@
COMPILER = @compiler@
@@ -309,6 +310,7 @@ clean: clean-implib
@echo BUILD:' '$(BUILD)
@echo HOST:' '$(HOST)
@echo CCHOST:' '$(CCHOST)
+ @echo CFGHOST:' '$(CFGHOST)
@echo TARGET:' '$(TARGET)
@echo ARCH:' '$(ARCH)
@echo COMPILER:' '$(COMPILER)
diff --git a/config.project b/config.project
index be0cde0..dc2e1e8 100644
--- a/config.project
+++ b/config.project
@@ -18,6 +18,7 @@ mb_pkglibs=
mb_default_build=
mb_default_host=
mb_default_cchost=
+mb_default_cfghost=
mb_default_target=
mb_default_arch=
mb_default_compiler=
diff --git a/config.usage b/config.usage
index 50f0a3f..b8792bd 100644
--- a/config.usage
+++ b/config.usage
@@ -45,6 +45,7 @@ supported switches:
--build
--host
--cchost
+ --cfghost
--target
--arch
--compiler
@@ -109,6 +110,7 @@ supported variables:
BUILD
HOST
CCHOST
+ CFGHOST
TARGET
ARCH
COMPILER
diff --git a/configure b/configure
index ddea6d3..8c4a4ab 100755
--- a/configure
+++ b/configure
@@ -67,6 +67,7 @@ init_vars()
mb_build=$BUILD
mb_host=$HOST
mb_cchost=$CCHOST
+ mb_cfghost=$CFGHOST
mb_target=$TARGET
mb_arch=$ARCH
mb_compiler=$COMPILER
@@ -216,6 +217,7 @@ common_defaults()
[ -z "$mb_build" ] && mb_build=$mb_default_build
[ -z "$mb_host" ] && mb_host=$mb_default_host
[ -z "$mb_cchost" ] && mb_cchost=$mb_default_cchost
+ [ -z "$mb_cfghost" ] && mb_cfghost=$mb_default_cfghost
[ -z "$mb_target" ] && mb_target=$mb_default_target
[ -z "$mb_arch" ] && mb_arch=$mb_default_arch
[ -z "$mb_compiler" ] && mb_compiler=$mb_default_compiler
@@ -551,8 +553,13 @@ config_copy()
fi
fi
- sed -e 's^@cchost@^'"$mb_cchost"'^g' $mb_pwd/Makefile.tmp \
- > $mb_pwd/Makefile.host || exit 2
+ if [ -z "$mb_cfghost" ]; then
+ mb_cfghost=$mb_cchost
+ fi
+
+ sed -e 's^@cchost@^'"$mb_cchost"'^g' \
+ -e 's^@cfghost@^'"$mb_cfghost"'^g' \
+ $mb_pwd/Makefile.tmp > $mb_pwd/Makefile.host || exit 2
rm $mb_pwd/Makefile.tmp || exit 2
mv $mb_pwd/Makefile.host $mb_pwd/Makefile || exit 2
@@ -690,6 +697,9 @@ for arg ; do
--cchost=*)
mb_cchost=${arg#*=}
;;
+ --cfghost=*)
+ mb_cfghost=${arg#*=}
+ ;;
--target=*)
mb_target=${arg#*=}
;;