Mercurial > mxe-octave
comparison src/native-gcc.mk @ 3981:f1cc0bdd57b6
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 | d83f02205481 |
children | 66a8db7ef2ab |
comparison
equal
deleted
inserted
replaced
3980:9f7e9b053041 | 3981:f1cc0bdd57b6 |
---|---|
26 --disable-win32-registry \ | 26 --disable-win32-registry \ |
27 --with-native-system-header-dir='$(HOST_PREFIX)/include' \ | 27 --with-native-system-header-dir='$(HOST_PREFIX)/include' \ |
28 --enable-threads=win32 | 28 --enable-threads=win32 |
29 ifneq ($(ENABLE_WINDOWS_64),yes) | 29 ifneq ($(ENABLE_WINDOWS_64),yes) |
30 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ | 30 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ |
31 $(ENABLE_SHARED_OR_STATIC) \ | |
31 --disable-multilib \ | 32 --disable-multilib \ |
32 --disable-sjlj-exceptions | 33 --disable-sjlj-exceptions |
33 else | 34 else |
34 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ | 35 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ |
35 --enable-multilib --enable-64bit | 36 --enable-multilib --enable-64bit --disable-shared |
36 endif | 37 endif |
37 else | 38 else |
38 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ | 39 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ |
40 $(ENABLE_SHARED_OR_STATIC) \ | |
39 --disable-multilib | 41 --disable-multilib |
40 endif | 42 endif |
41 | 43 |
42 define $(PKG)_UPDATE | 44 define $(PKG)_UPDATE |
43 $(WGET) -q -O- 'http://ftp.gnu.org/gnu/gcc/?C=M;O=D' | \ | 45 $(WGET) -q -O- 'http://ftp.gnu.org/gnu/gcc/?C=M;O=D' | \ |
54 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ | 56 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ |
55 --prefix='$(HOST_PREFIX)' \ | 57 --prefix='$(HOST_PREFIX)' \ |
56 --enable-languages='c,c++,fortran' \ | 58 --enable-languages='c,c++,fortran' \ |
57 --disable-libsanitizer \ | 59 --disable-libsanitizer \ |
58 $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \ | 60 $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \ |
59 $(ENABLE_SHARED_OR_STATIC) \ | |
60 --disable-libgomp \ | 61 --disable-libgomp \ |
61 --with-cloog='$(HOST_PREFIX)' \ | 62 --with-cloog='$(HOST_PREFIX)' \ |
62 --with-gmp='$(HOST_PREFIX)' \ | 63 --with-gmp='$(HOST_PREFIX)' \ |
63 --with-isl='$(HOST_PREFIX)' \ | 64 --with-isl='$(HOST_PREFIX)' \ |
64 --with-mpc='$(HOST_PREFIX)' \ | 65 --with-mpc='$(HOST_PREFIX)' \ |