diff options
| author | midipix <writeonce@midipix.org> | 2018-11-22 04:20:59 -0500 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2018-11-22 04:36:57 -0500 |
| commit | f9d92c6d0a4712596f831d7876718cb0f73e4508 (patch) | |
| tree | b31d542d9702a632567663f7fd6ad4f4fdec54db | |
| parent | ca36f56b368ece9c0f3b276a456e5c5a7ce3c151 (diff) | |
| download | slibtool-f9d92c6d0a4712596f831d7876718cb0f73e4508.tar.bz2 slibtool-f9d92c6d0a4712596f831d7876718cb0f73e4508.tar.xz | |
build system: added --cfghost support.
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | config.project | 1 | ||||
| -rw-r--r-- | config.usage | 2 | ||||
| -rwxr-xr-x | configure | 14 |
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 ce0b787..c20f4e7 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 @@ -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#*=} ;; |