[lmi-commits] [lmi] master b84d993 1/2: Pass compiler flags to wx configury in the conventional way

[Greg Chicares]

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

    Pass compiler flags to wx configury in the conventional way
    
    See this thread:
      http://lists.nongnu.org/archive/html/lmi/2016-08/msg00012.html
---
 install_wx.make       |    9 ++++-----
 install_wxpdfdoc.make |    6 ++++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/install_wx.make b/install_wx.make
index 4180145..b878e38 100644
--- a/install_wx.make
+++ b/install_wx.make
@@ -97,9 +97,6 @@ build_dir      := $(wx_dir)/wxWidgets-$(wx_version)/$(vendor)
 
 # Configuration reference:
 #   http://lists.nongnu.org/archive/html/lmi/2007-11/msg00001.html
-#
-# Pass gcc options in $CC and $CXX, not $*FLAGS--explanation here:
-#   http://lists.nongnu.org/archive/html/lmi/2013-07/msg00001.html
 
 wx_cc_flags    := -fno-omit-frame-pointer
 wx_cxx_flags   := -fno-omit-frame-pointer -std=c++11
@@ -128,11 +125,13 @@ config_options = \
   --without-libtiff \
   --without-opengl \
   --without-subdirs \
+  CFLAGS='$(wx_cc_flags)' \
+  CXXFLAGS='$(wx_cxx_flags)' \
        AR='$(mingw_bin_dir)/$(triplet_prefix)ar' \
        AS='$(mingw_bin_dir)/$(triplet_prefix)as' \
-       CC='$(mingw_bin_dir)/$(triplet_prefix)gcc $(wx_cc_flags)' \
+       CC='$(mingw_bin_dir)/$(triplet_prefix)gcc' \
       CPP='$(mingw_bin_dir)/$(triplet_prefix)cpp' \
-      CXX='$(mingw_bin_dir)/$(triplet_prefix)g++ $(wx_cxx_flags)' \
+      CXX='$(mingw_bin_dir)/$(triplet_prefix)g++' \
   DLLTOOL='$(mingw_bin_dir)/$(triplet_prefix)dlltool' \
        LD='$(mingw_bin_dir)/$(triplet_prefix)ld' \
        NM='$(mingw_bin_dir)/$(triplet_prefix)nm' \
diff --git a/install_wxpdfdoc.make b/install_wxpdfdoc.make
index 2c3802c..086741d 100644
--- a/install_wxpdfdoc.make
+++ b/install_wxpdfdoc.make
@@ -63,11 +63,13 @@ config_options = \
   --host=i686-w64-mingw32 \
   --disable-dependency-tracking \
   --with-wx-config=$(prefix)/bin/wx-config-portable \
+  CFLAGS='$(wx_cc_flags)' \
+  CXXFLAGS='$(wx_cxx_flags)' \
        AR='$(mingw_bin_dir)/$(triplet_prefix)ar' \
        AS='$(mingw_bin_dir)/$(triplet_prefix)as' \
-       CC='$(mingw_bin_dir)/$(triplet_prefix)gcc $(wx_cc_flags)' \
+       CC='$(mingw_bin_dir)/$(triplet_prefix)gcc' \
       CPP='$(mingw_bin_dir)/$(triplet_prefix)cpp' \
-      CXX='$(mingw_bin_dir)/$(triplet_prefix)g++ $(wx_cxx_flags)' \
+      CXX='$(mingw_bin_dir)/$(triplet_prefix)g++' \
   DLLTOOL='$(mingw_bin_dir)/$(triplet_prefix)dlltool' \
        LD='$(mingw_bin_dir)/$(triplet_prefix)ld' \
        NM='$(mingw_bin_dir)/$(triplet_prefix)nm' \