diff options
| author | midipix <writeonce@midipix.org> | 2018-12-02 20:32:30 -0500 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2018-12-10 20:34:36 -0500 |
| commit | 03cc75bba4f50253d6bfbcae0d392accd35789ce (patch) | |
| tree | 54b08c1cd4d52580bc31eb03d0eb9c01db61e580 | |
| parent | 5581ef2ee15f513c6fac5de3889bd420e3385561 (diff) | |
| download | ntux-03cc75bba4f50253d6bfbcae0d392accd35789ce.tar.bz2 ntux-03cc75bba4f50253d6bfbcae0d392accd35789ce.tar.xz | |
build system: added NATIVE_CC_HOST support.
| -rw-r--r-- | Makefile.in | 9 | ||||
| -rw-r--r-- | config.usage | 2 | ||||
| -rwxr-xr-x | configure | 8 |
3 files changed, 18 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 208a2ed..89d4904 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,6 +84,8 @@ PDFDIR = @pdfdir@ PSDIR = @psdir@ NATIVE_CC = @native_cc@ +NATIVE_CC_HOST = @native_cc_host@ + NATIVE_OS = @native_os@ NATIVE_OS_BITS = @native_os_bits@ NATIVE_OS_UNDERSCORE = @native_os_underscore@ @@ -251,6 +253,9 @@ host.tag: Makefile $(PROJECT_DIR)/sysinfo/host/host.sh --compiler="$(CC)" --cflags="$(CFLAGS)" touch host.tag +cchost-native: + $(PROJECT_DIR)/sysinfo/host/host.sh --compiler="$(NATIVE_CC)" + version.tag: $(GIT_REFERENCE_INDEX) $(PROJECT_DIR)/sysinfo/version.sh \ -s $(SOURCE_DIR) \ @@ -412,6 +417,8 @@ clean: clean-implib .display-build: @echo NATIVE_CC:' '$(NATIVE_CC) + @echo NATIVE_CC_HOST:' '$(NATIVE_CC_HOST) + @echo @echo NATIVE_OS:' '$(NATIVE_OS) @echo NATIVE_OS_BITS:' '$(NATIVE_OS_BITS) @echo NATIVE_OS_UNDERSCORE:' '$(NATIVE_OS_UNDERSCORE) @@ -438,7 +445,7 @@ clean: clean-implib @echo $(CFLAGS) -.PHONY: cchost package-app \ +.PHONY: cchost cchost-native package-app \ all install shared static app \ shared-objs shared-lib \ shared-soname shared-solink \ diff --git a/config.usage b/config.usage index b8792bd..36303cd 100644 --- a/config.usage +++ b/config.usage @@ -152,6 +152,8 @@ supported variables: ELF_CONFIG_DEFS NATIVE_CC + NATIVE_CC_HOST + NATIVE_OS NATIVE_OS_BITS NATIVE_OS_UNDERSCORE @@ -113,6 +113,8 @@ init_vars() # overrides mb_native_cc=$NATIVE_CC + mb_native_cc_host=$NATIVE_CC_HOST + mb_native_os=$NATIVE_OS mb_native_os_bits=$NATIVE_OS_BITS mb_native_os_underscore=$NATIVE_OS_UNDERSCORE @@ -346,6 +348,10 @@ native_defaults() mb_native_cc='false' fi + if [ -z "$mb_native_cc_host" ]; then + mb_native_cc_host=$($mb_project_dir/sysinfo/host/host.sh --compiler=$mb_native_cc) + fi + if [ -z "$mb_compiler" ]; then $mb_native_cc -dM -E - < /dev/null | grep -q '__clang__' && mb_compiler='clang' fi @@ -530,6 +536,8 @@ config_copy() -e 's^@psdir@^'"$mb_psdir"'^g' \ \ -e 's^@native_cc@^'"$mb_native_cc"'^g' \ + -e 's^@native_cc_host@^'"$mb_native_cc_host"'^g' \ + \ -e 's^@native_os@^'"$mb_native_os"'^g' \ -e 's^@native_os_bits@^'"$mb_native_os_bits"'^g' \ -e 's^@native_os_underscore@^'"$mb_native_os_underscore"'^g' \ |