From 27a0fe0e28382d1bd64348b728e07e7889547530 Mon Sep 17 00:00:00 2001 From: midipix Date: Sun, 2 Dec 2018 20:32:30 -0500 Subject: build system: added NATIVE_CC_HOST support. --- Makefile.in | 9 ++++++++- config.usage | 2 ++ configure | 8 ++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) 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 diff --git a/configure b/configure index 8c4a4ab..e607fee 100755 --- a/configure +++ b/configure @@ -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' \ -- cgit v1.2.3