Changeset aa560b in git

Timestamp:

Jun 17, 2020, 10:50:10 AM (3 years ago)

Author:

Max Horn <max@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

02eb92fd41522fc551742fd1c1a368263c5401e9

Parents:

89fd206d2c694d9425c5138b97769b3a8fe76cec

git-author:

Max Horn <max@quendi.de>2020-06-17 10:50:10+02:00

git-committer:

Max Horn <max@quendi.de>2020-06-17 15:12:47+02:00

Message:

Update ax_prog_cxx_for_build.m4

... to match changes made to ax_prog_cc_for_build.m4 recently.

- save/restore GXX
- honor `./configure --build=BUILD`
- use AC_LANG_PUSH and AC_LANG_POP to save and restore global variables
  used for running tests like ac_compile and ac_link
- use pushdef/popdef to save and restore ac_tool_prefix, cross_compiling
  and am_cv_CXX_dependencies_compiler_type (not sure if we need the latter
  but this mimicks what AX_PROG_CC_FOR_BUILD does)

Submitted to upstream, see <https://savannah.gnu.org/patch/?9943>

File:

• m4/ax_prog_cxx_for_build.m4 (modified) (4 diffs)

m4/ax_prog_cxx_for_build.m4

@@ -32 +32 @@
 #   warranty.
 
-#serial 3
+#serial 4
 
 AU_ALIAS([AC_PROG_CXX_FOR_BUILD], [AX_PROG_CXX_FOR_BUILD])
@@ -50 +50 @@
 pushdef([CXX], CXX_FOR_BUILD)dnl
 pushdef([CXXCPP], CXXCPP_FOR_BUILD)dnl
+pushdef([GXX], GXX_FOR_BUILD)dnl
 pushdef([CXXFLAGS], CXXFLAGS_FOR_BUILD)dnl
 pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
@@ -63 +64 @@
 pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
 pushdef([ac_cv_host_os], ac_cv_build_os)dnl
-pushdef([ac_cxxcpp], ac_build_cxxcpp)dnl
-pushdef([ac_compile], ac_build_compile)dnl
-pushdef([ac_link], ac_build_link)dnl
+pushdef([ac_tool_prefix], ac_build_tool_prefix)dnl
+pushdef([am_cv_CXX_dependencies_compiler_type], am_cv_build_CXX_dependencies_compiler_type)dnl
+pushdef([cross_compiling], cross_compiling_build)dnl
 
-save_cross_compiling=$cross_compiling
-save_ac_tool_prefix=$ac_tool_prefix
-cross_compiling=no
-ac_tool_prefix=
+cross_compiling_build=no
 
+ac_build_tool_prefix=
+AS_IF([test -n "$build"],      [ac_build_tool_prefix="$build-"],
+      [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"])
+
+AC_LANG_PUSH([C++])
 AC_PROG_CXX
 AC_PROG_CXXCPP
 
-ac_tool_prefix=$save_ac_tool_prefix
-cross_compiling=$save_cross_compiling
-
 dnl Restore the old definitions
 dnl
-popdef([ac_link])dnl
-popdef([ac_compile])dnl
-popdef([ac_cxxcpp])dnl
+popdef([cross_compiling])dnl
+popdef([am_cv_CXX_dependencies_compiler_type])dnl
+popdef([ac_tool_prefix])dnl
 popdef([ac_cv_host_os])dnl
 popdef([ac_cv_host_vendor])dnl
@@ -104 +104 @@
 popdef([ac_cv_prog_CXXCPP])dnl
 
+dnl restore global variables (dependant on the current
+dnl language after popping):
+AC_LANG_POP([C++])
+
 dnl Finally, set Makefile variables
 dnl