Changeset ed6f2b in git

Timestamp:

Jun 17, 2020, 4:09:05 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

6e12a4509235103a5e009837c0a1ae25ff078e5b

Parents:

48e0bcb3839c4f7cc786ac37fa187054f0536239e4514d3151a5c53437b9fa2f30bda8febfd87539

Message:

Merge branch 'fingolfin-mh/fix' into spielwiese

Files:

• libpolys/polys/Makefile.am (modified) (1 diff)
• m4/ax_prog_cxx_for_build.m4 (modified) (4 diffs)
• omalloc/Makefile.am (modified) (1 diff)

libpolys/polys/Makefile.am

@@ -112 +112 @@
 
 templates/p_Procs.inc: p_Procs_Generate.cc
-        $(MAKE) $(AM_MAKEFLAGS) CXX="$(CXX_FOR_BUILD)" p_Procs_Generate
+        $(MAKE) $(AM_MAKEFLAGS) CXX="$(CXX_FOR_BUILD)" CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" LDFLAGS="" LIBS="" p_Procs_Generate
         ./p_Procs_Generate$(BUILD_EXEEXT) > ./templates/p_Procs.inc
 

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

omalloc/Makefile.am

@@ -41 +41 @@
 
 omTables.inc:
-        $(MAKE) $(AM_MAKEFLAGS) CC="${CC_FOR_BUILD}" omTables
+        $(MAKE) $(AM_MAKEFLAGS) CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" LDFLAGS="$(LDFLAGS_FOR_BUILD)" omTables
         ./omTables$(BUILD_EXEEXT) > omTables.xx && mv omTables.xx  omTables.inc
 
 omTables.h:
-        $(MAKE) $(AM_MAKEFLAGS) CC="${CC_FOR_BUILD}" omTables1
+        $(MAKE) $(AM_MAKEFLAGS) CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" LDFLAGS="$(LDFLAGS_FOR_BUILD)" omTables1
         ./omTables1$(BUILD_EXEEXT) >omTables.yy && mv omTables.yy omTables.h