Mercurial > mxe-octave

changeset 3981:f1cc0bdd57b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
native-gcc: compile gcc as static when using mingw64 * src/native-gcc.mk: use --static in mingw64 mode
author John Donoghue
date Thu, 02 Jul 2015 13:55:48 -0400
parents 9f7e9b053041
children 4166ce402753
files src/native-gcc.mk
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/native-gcc.mk	Tue Jun 30 13:41:41 2015 -0400
+++ b/src/native-gcc.mk	Thu Jul 02 13:55:48 2015 -0400
@@ -28,14 +28,16 @@
     --enable-threads=win32 
   ifneq ($(ENABLE_WINDOWS_64),yes)
     $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
+      $(ENABLE_SHARED_OR_STATIC) \
       --disable-multilib \
       --disable-sjlj-exceptions
   else
     $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
-      --enable-multilib --enable-64bit
+      --enable-multilib --enable-64bit --disable-shared
   endif
 else
   $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
+    $(ENABLE_SHARED_OR_STATIC) \
     --disable-multilib
 endif
 
@@ -56,7 +58,6 @@
         --enable-languages='c,c++,fortran' \
         --disable-libsanitizer \
         $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \
-        $(ENABLE_SHARED_OR_STATIC) \
         --disable-libgomp \
         --with-cloog='$(HOST_PREFIX)' \
         --with-gmp='$(HOST_PREFIX)' \