Mercurial > mxe-octave
changeset 3944:d83f02205481
native-gcc: compile as multilib in win64
* src/native-binutils.mk: in win64 mode, enable multilib and targets=targets=x86_64-w64-mingw32,i686-w64-mingw32
* src/native-gcc.mk: in win64, enable mutilib, copy lib32 file to correct splot
author | John Donoghue |
---|---|
date | Wed, 20 May 2015 07:36:47 -0400 |
parents | cbefb206115e |
children | a397ccee4b57 |
files | src/native-binutils.mk src/native-gcc.mk |
diffstat | 2 files changed, 21 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/native-binutils.mk Tue May 19 08:10:12 2015 -0400 +++ b/src/native-binutils.mk Wed May 20 07:36:47 2015 -0400 @@ -11,6 +11,14 @@ $(PKG)_URL_2 := ftp://ftp.cs.tu-berlin.de/pub/gnu/binutils/$($(PKG)_FILE) $(PKG)_DEPS := +$(PKG)_SYSDEP_OPTIONS := +ifeq ($(ENABLE_WINDOWS_64),yes) + $(PKG)_SYSDEP_OPTIONS += \ + --enable-multilib \ + --enable-targets=x86_64-w64-mingw32,i686-w64-mingw32 +endif + + define $(PKG)_UPDATE $(WGET) -q -O- 'http://ftp.gnu.org/gnu/binutils/?C=M;O=D' | \ $(SED) -n 's,.*<a href="binutils-\([0-9][^"]*\)\.tar.*,\1,p' | \ @@ -29,6 +37,7 @@ cd '$(1)' && ./configure \ --target='$(TARGET)' \ + $($(PKG)_SYSDEP_OPTIONS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ --with-gcc \
--- a/src/native-gcc.mk Tue May 19 08:10:12 2015 -0400 +++ b/src/native-gcc.mk Wed May 20 07:36:47 2015 -0400 @@ -28,8 +28,15 @@ --enable-threads=win32 ifneq ($(ENABLE_WINDOWS_64),yes) $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ + --disable-multilib \ --disable-sjlj-exceptions + else + $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ + --enable-multilib --enable-64bit endif +else + $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ + --disable-multilib endif define $(PKG)_UPDATE @@ -47,7 +54,6 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ --enable-languages='c,c++,fortran' \ - --disable-multilib \ --disable-libsanitizer \ $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ @@ -65,4 +71,9 @@ if [ -f $(HOST_PREFIX)/lib/gcc/$(TARGET)/lib/libgcc_s.a ]; then \ mv $(HOST_PREFIX)/lib/gcc/$(TARGET)/lib/libgcc_s.a $(HOST_PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/libgcc_s.a; \ fi + + if [ -f $(HOST_PREFIX)/lib/gcc/$(TARGET)/lib32/libgcc_s.a ]; then \ + mv $(HOST_PREFIX)/lib/gcc/$(TARGET)/lib32/libgcc_s.a $(HOST_PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/32/libgcc_s.a; \ + fi + endef