Mercurial > mxe-octave
changeset 4626:b864dc772f15
gcc: remove multilib references
* src/build-binutils.mk: remove win64 multilib options
* src/build-gcc.mk: refactor cross build configure options where common
* src/native-binutils.mk: remove win64 enable multilib
* src/native-gcc.mk: refect options where common for cross build
| author | John Donoghue |
|---|---|
| date | Mon, 12 Mar 2018 17:15:46 -0400 |
| parents | b8385340a96a |
| children | 1cd7d7fd437a |
| files | src/build-binutils.mk src/build-gcc.mk src/native-binutils.mk src/native-gcc.mk |
| diffstat | 4 files changed, 11 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/src/build-binutils.mk Sat Mar 10 16:35:15 2018 -0500 +++ b/src/build-binutils.mk Mon Mar 12 17:15:46 2018 -0400 @@ -12,17 +12,10 @@ $(PKG)_DEPS := ifneq ($(MXE_NATIVE_BUILD),yes) -ifneq ($(ENABLE_WINDOWS_64),yes) - define $(PKG)_POST_BUILD - $(INSTALL) -d '$(3)/$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)' - mv $(addprefix $(3)/$(HOST_PREFIX)/bin/, ar as dlltool ld ld.bfd nm objcopy objdump ranlib strip) '$(3)/$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)' - endef -else define $(PKG)_POST_BUILD rm $(addprefix $(3)/$(HOST_PREFIX)/bin/, ar as dlltool ld ld.bfd nm objcopy objdump ranlib strip) endef endif -endif define $(PKG)_UPDATE $(WGET) -q -O- 'http://ftp.gnu.org/gnu/binutils/?C=M;O=D' | \ @@ -37,18 +30,9 @@ $(PKG)_SYSDEP_CONFIGURE_OPTIONS := \ --target='$(TARGET)' \ --build='$(BUILD_SYSTEM)' \ - - ifeq ($(ENABLE_WINDOWS_64),yes) - $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ - --enable-multilib \ - --with-sysroot='$(BUILD_TOOLS_PREFIX)' \ - --enable-targets=x86_64-w64-mingw32,i686-w64-mingw32 - else - $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ - --libdir='$(BUILD_TOOLS_PREFIX)/lib' \ - --disable-multilib \ - --with-sysroot='$(HOST_PREFIX)' - endif + --libdir='$(BUILD_TOOLS_PREFIX)/lib' \ + --disable-multilib \ + --with-sysroot='$(HOST_PREFIX)' endif define $(PKG)_BUILD
--- a/src/build-gcc.mk Sat Mar 10 16:35:15 2018 -0500 +++ b/src/build-gcc.mk Mon Mar 12 17:15:46 2018 -0400 @@ -36,7 +36,7 @@ $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ --libdir='$(BUILD_TOOLS_PREFIX)/lib' \ --with-native-system-header-dir='/include' \ - --disable-sjlj-exceptions + --disable-sjlj-exceptions else define $(PKG)_PRE_BUILD echo "Shortcuts" @@ -97,15 +97,12 @@ --build='$(BUILD_SYSTEM)' \ --with-as='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-as' \ --with-ld='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ld' \ - --with-nm='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-nm' + --with-nm='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-nm' \ + --disable-multilib --with-host-libstdcxx="-lstdc++" --with-system-zlib ifeq ($(ENABLE_WINDOWS_64),yes) - $(PKG)_SYSDEP_CONFIGURE_OPTIONS += --with-sysroot='$(BUILD_TOOLS_PREFIX)' \ - --disable-multilib --with-host-libstdcxx="-lstdc++" --with-system-zlib \ + $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ --enable-64bit --enable-fully-dynamic-string - else - $(PKG)_SYSDEP_CONFIGURE_OPTIONS += --with-sysroot='$(HOST_PREFIX)' \ - --disable-multilib endif else $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
--- a/src/native-binutils.mk Sat Mar 10 16:35:15 2018 -0500 +++ b/src/native-binutils.mk Mon Mar 12 17:15:46 2018 -0400 @@ -12,12 +12,6 @@ $(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' | \
--- a/src/native-gcc.mk Sat Mar 10 16:35:15 2018 -0500 +++ b/src/native-gcc.mk Mon Mar 12 17:15:46 2018 -0400 @@ -25,15 +25,15 @@ --without-x \ --disable-win32-registry \ --with-native-system-header-dir='$(HOST_PREFIX)/include' \ - --enable-threads=posix + --enable-threads=posix \ + --disable-multilib + 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 --disable-shared + --enable-64bit endif else $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \