[lmi-commits] [lmi] master a9bcf09: Use '-fno-ms-extensions' wherever possible

[Greg Chicares]

branch: master
commit a9bcf09ec414a3ec127a05b66c35851126eb318c
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Use '-fno-ms-extensions' wherever possible
    
    See:
      https://lists.nongnu.org/archive/html/lmi/2019-06/msg00017.html
      https://lists.nongnu.org/archive/html/lmi/2019-06/msg00018.html
---
 install_libxml2_libxslt.make |  6 +++++-
 install_wx.sh                |  8 +++-----
 install_wxpdfdoc.sh          |  8 +++-----
 workhorse.make               | 10 +++++-----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/install_libxml2_libxslt.make b/install_libxml2_libxslt.make
index 8be2559..d217892 100644
--- a/install_libxml2_libxslt.make
+++ b/install_libxml2_libxslt.make
@@ -61,7 +61,9 @@ ifeq (cygwin,$(findstring cygwin,$(lmi_build_type)))
 endif
 
 # For 'host' and 'build' configure options, see:
-#   http://cygwin.com/ml/cygwin/2002-01/msg00837.html
+#   https://cygwin.com/ml/cygwin/2002-01/msg00837.html
+# Do not use '-fno-omit-frame-pointer' because of an ICE:
+#   https://lists.nongnu.org/archive/html/lmi/2019-06/msg00018.html
 
 # '--disable-dependency-tracking' is required with the MinGW toolchain
 # in a Cygwin shell, to prevent a catastrophic dependency-tracking
@@ -71,6 +73,8 @@ endif
 #   .deps/DOCBparser.Plo:1: *** multiple target patterns.  Stop.
 
 xmlsoft_common_cflags := \
+  -fno-ms-extensions \
+  -frounding-math \
   -Wno-cpp \
   -Wno-discarded-qualifiers \
   -Wno-format \
diff --git a/install_wx.sh b/install_wx.sh
index 82c4853..100505f 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -95,8 +95,8 @@ vendor=${LMI_TRIPLET}-$gcc_version-$wx_commit_sha
 # Configuration reference:
 #   http://lists.nongnu.org/archive/html/lmi/2007-11/msg00001.html
 
-wx_cc_flags=-fno-omit-frame-pointer
-wx_cxx_flags=-fno-omit-frame-pointer
+wx_cc_flags='-fno-ms-extensions -fno-omit-frame-pointer -frounding-math'
+wx_cxx_flags='-fno-ms-extensions -fno-omit-frame-pointer -frounding-math'
 
 config_options="
   --prefix=$prefix
@@ -128,8 +128,6 @@ config_options="
   --without-opengl
   --without-subdirs
   CPPFLAGS=-I$prefix/include
-  CFLAGS=$wx_cc_flags
-  CXXFLAGS=$wx_cxx_flags
   LDFLAGS=-L$exec_prefix/lib
 "
 
@@ -153,7 +151,7 @@ mkdir --parents "$build_dir"
 cd "$build_dir"
 # 'configure' options must not be double-quoted
 # shellcheck disable=SC2086
-"$proxy_wx_dir"/configure $config_options
+"$proxy_wx_dir"/configure $config_options CFLAGS="$wx_cc_flags" 
CXXFLAGS="$wx_cxx_flags"
 $MAKE
 $MAKE install
 
diff --git a/install_wxpdfdoc.sh b/install_wxpdfdoc.sh
index 1500d21..2b2209d 100755
--- a/install_wxpdfdoc.sh
+++ b/install_wxpdfdoc.sh
@@ -85,8 +85,8 @@ case "$build_type" in
         ;;
 esac
 
-wxpdfdoc_cc_flags=-fno-omit-frame-pointer
-wxpdfdoc_cxx_flags=-fno-omit-frame-pointer
+wxpdfdoc_cc_flags='-fno-ms-extensions -fno-omit-frame-pointer -frounding-math'
+wxpdfdoc_cxx_flags='-fno-ms-extensions -fno-omit-frame-pointer -frounding-math'
 
 config_options="
   --prefix=$prefix
@@ -96,8 +96,6 @@ config_options="
   --build=$build_type
   --host=$LMI_TRIPLET
   --disable-dependency-tracking
-  CFLAGS=$wxpdfdoc_cc_flags
-  CXXFLAGS=$wxpdfdoc_cxx_flags
 "
 
 [ -n "$mingw_bin_dir" ] && export PATH="$mingw_bin_dir:${PATH}"
@@ -119,7 +117,7 @@ mkdir --parents "$build_dir"
 cd "$build_dir"
 # 'configure' options must not be double-quoted
 # shellcheck disable=SC2086
-"$proxy_wxpdfdoc_dir"/configure $config_options
+"$proxy_wxpdfdoc_dir"/configure $config_options CFLAGS="$wxpdfdoc_cc_flags" 
CXXFLAGS="$wxpdfdoc_cxx_flags"
 $MAKE
 $MAKE install
 
diff --git a/workhorse.make b/workhorse.make
index df62344..4e8b09c 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -363,8 +363,8 @@ tutelary_flag :=
 # which causes harm while bringing no countervailing benefit--see:
 #   http://lists.nongnu.org/archive/html/lmi/2017-08/msg00045.html
 
-c_standard   := -frounding-math -std=c99
-cxx_standard := -frounding-math -std=c++17
+c_standard   := -fno-ms-extensions -frounding-math -std=c99
+cxx_standard := -fno-ms-extensions -frounding-math -std=c++17
 
 # Specify $(gcc_version_specific_warnings) last, in order to override
 # other options.
@@ -398,11 +398,11 @@ else ifneq (,$(filter $(gcc_version), 6.3.0))
   gcc_version_specific_warnings := \
     -Wno-conversion \
 
-  cxx_standard := -frounding-math -std=c++17
+  cxx_standard := -fno-ms-extensions -frounding-math -std=c++17
 else ifneq (,$(filter $(gcc_version), 7.2.0 7.3.0))
   gcc_version_specific_warnings := \
 
-  cxx_standard := -frounding-math -std=c++17
+  cxx_standard := -fno-ms-extensions -frounding-math -std=c++17
 else ifneq (,$(filter $(gcc_version), 8.1.0 8.2.0 8.3.0))
   gcc_version_specific_warnings := \
 
@@ -412,7 +412,7 @@ else ifneq (,$(filter $(gcc_version), 8.1.0 8.2.0 8.3.0))
     tutelary_flag := -fomit-frame-pointer
   endif
 
-  cxx_standard := -frounding-math -std=c++17
+  cxx_standard := -fno-ms-extensions -frounding-math -std=c++17
 endif
 
 treat_warnings_as_errors := -pedantic-errors -Werror