[lmi-commits] [6479] Prefer native to cross MinGW-w64 compiler

[Greg Chicares]

Revision: 6479
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6479
Author:   chicares
Date:     2016-01-20 11:31:33 +0000 (Wed, 20 Jan 2016)
Log Message:
-----------
Prefer native to cross MinGW-w64 compiler

Modified Paths:
--------------
    lmi/trunk/install_wx.make
    lmi/trunk/install_wxpdfdoc.make
    lmi/trunk/msw_cygwin.make

Modified: lmi/trunk/install_wx.make
===================================================================
--- lmi/trunk/install_wx.make   2016-01-20 11:29:47 UTC (rev 6478)
+++ lmi/trunk/install_wx.make   2016-01-20 11:31:33 UTC (rev 6479)
@@ -27,8 +27,7 @@
 
 wx_version    := 3.0.0
 
-# mingw_dir     := /MinGW_
-mingw_dir     := /usr
+mingw_dir     := /MinGW_
 
 prefix        := /opt/lmi/local
 
@@ -82,7 +81,8 @@
 
 mingw_bin_dir  := $(mingw_dir)/bin
 
-triplet_prefix := i686-w64-mingw32-
+#triplet_prefix := i686-w64-mingw32-
+triplet_prefix :=
 
 compiler       := gcc-$(shell $(mingw_bin_dir)/$(triplet_prefix)gcc 
-dumpversion)
 vendor         := $(subst .,,$(compiler))-$(wx_md5)

Modified: lmi/trunk/install_wxpdfdoc.make
===================================================================
--- lmi/trunk/install_wxpdfdoc.make     2016-01-20 11:29:47 UTC (rev 6478)
+++ lmi/trunk/install_wxpdfdoc.make     2016-01-20 11:31:33 UTC (rev 6479)
@@ -25,8 +25,7 @@
 
 # Configurable settings 
########################################################
 
-# mingw_dir     := /MinGW_
-mingw_dir     := /usr
+mingw_dir     := /MinGW_
 
 prefix        := /opt/lmi/local
 
@@ -52,7 +51,8 @@
 
 mingw_bin_dir  := $(mingw_dir)/bin
 
-triplet_prefix := i686-w64-mingw32-
+#triplet_prefix := i686-w64-mingw32-
+triplet_prefix :=
 
 compiler       := gcc-$(shell $(mingw_bin_dir)/$(triplet_prefix)gcc 
-dumpversion)
 

Modified: lmi/trunk/msw_cygwin.make
===================================================================
--- lmi/trunk/msw_cygwin.make   2016-01-20 11:29:47 UTC (rev 6478)
+++ lmi/trunk/msw_cygwin.make   2016-01-20 11:31:33 UTC (rev 6479)
@@ -67,8 +67,7 @@
 
 ifeq (,$(USE_STD_PATHS))
   PATH_BIN     := /bin/
-#  PATH_GCC     := /MinGW_/bin/
-  PATH_GCC     := /usr/bin/
+  PATH_GCC     := /MinGW_/bin/
   PATH_USR_BIN := /usr/bin/
 endif
 
@@ -76,7 +75,8 @@
 
 # Compiler, linker, and so on.
 
-triplet_prefix := i686-w64-mingw32-
+#triplet_prefix := i686-w64-mingw32-
+triplet_prefix :=
 
 AR      := $(PATH_GCC)$(triplet_prefix)ar
 CC      := $(PATH_GCC)$(triplet_prefix)gcc $(cross_compile_flags)
@@ -89,8 +89,7 @@
 #   https://cygwin.com/ml/cygwin/2010-09/msg00553.html
 # Of course manipulating an lmi user's $PATH is out of the question.
 
-compiler_triplet := $(patsubst %-,%,$(triplet_prefix))
-compiler_sysroot := /usr/$(compiler_triplet)/sys-root/mingw/bin
+compiler_sysroot := /MinGW_/i686-w64-mingw32/lib
 
 compiler_runtime_files := \
   $(compiler_sysroot)/libstdc++-6.dll \