build: Propagate TOOL_FOR_BUILD variables to the configure script

hebasto · hebasto · commit ef802d0a714b · 2022-07-21T16:37:54.000+01:00
diff --git a/depends/Makefile b/depends/Makefile
@@ -220,6 +220,14 @@ $(host_prefix)/.stamp_$(final_build_id): $(native_packages) $(packages)
 $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_build_id)
 	@mkdir -p $(@D)
 	sed -e 's|@HOST@|$(host)|' \
+            -e 's|@CC_FOR_BUILD@|$(build_CC)|' \
+            -e 's|@CXX_FOR_BUILD@|$(build_CXX)|' \
+            -e 's|@AR_FOR_BUILD@|$(build_AR)|' \
+            -e 's|@TAR_FOR_BUILD@|$(build_TAR)|' \
+            -e 's|@RANLIB_FOR_BUILD@|$(build_RANLIB)|' \
+            -e 's|@NM_FOR_BUILD@|$(build_NM)|' \
+            -e 's|@STRIP_FOR_BUILD@|$(build_STRIP)|' \
+            -e 's|@build_os@|$(build_os)|' \
             -e 's|@CC@|$(host_CC)|' \
             -e 's|@CXX@|$(host_CXX)|' \
             -e 's|@AR@|$(host_AR)|' \
@@ -229,7 +237,6 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
             -e 's|@OTOOL@|$(host_OTOOL)|' \
             -e 's|@INSTALL_NAME_TOOL@|$(host_INSTALL_NAME_TOOL)|' \
             -e 's|@DSYMUTIL@|$(host_DSYMUTIL)|' \
-            -e 's|@build_os@|$(build_os)|' \
             -e 's|@host_os@|$(host_os)|' \
             -e 's|@CFLAGS@|$(strip $(host_CFLAGS) $(host_$(release_type)_CFLAGS))|' \
             -e 's|@CXXFLAGS@|$(strip $(host_CXXFLAGS) $(host_$(release_type)_CXXFLAGS))|' \
diff --git a/depends/config.site.in b/depends/config.site.in
@@ -95,6 +95,28 @@ fi
 CPPFLAGS="-I${depends_prefix}/include/ ${CPPFLAGS}"
 LDFLAGS="-L${depends_prefix}/lib ${LDFLAGS}"
 
+if test -n "@CC_FOR_BUILD@" -a -z "${CC_FOR_BUILD}"; then
+  CC_FOR_BUILD="@CC_FOR_BUILD@"
+fi
+if test -n "@CXX_FOR_BUILD@" -a -z "${CXX_FOR_BUILD}"; then
+  CXX_FOR_BUILD="@CXX_FOR_BUILD@"
+fi
+if test -n "@AR_FOR_BUILD@"; then
+  AR_FOR_BUILD="@AR_FOR_BUILD@"
+fi
+if test -n "@TAR_FOR_BUILD@"; then
+  TAR_FOR_BUILD="@TAR_FOR_BUILD@"
+fi
+if test -n "@RANLIB_FOR_BUILD@"; then
+  RANLIB_FOR_BUILD="@RANLIB_FOR_BUILD@"
+fi
+if test -n "@NM_FOR_BUILD@"; then
+  NM_FOR_BUILD="@NM_FOR_BUILD@"
+fi
+if test -n "@STRIP_FOR_BUILD@"; then
+  STRIP_FOR_BUILD="@STRIP_FOR_BUILD@"
+fi
+
 if test -n "@CC@" -a -z "${CC}"; then
   CC="@CC@"
 fi
