Mercurial > mxe-octave

comparison src/build-gcc.mk @ 4626:b864dc772f15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 0539bcde3fa8
children e4e57c85b3c7
comparison
equal deleted inserted replaced
4625:b8385340a96a 4626:b864dc772f15
34 --enable-threads=posix 34 --enable-threads=posix
35 ifneq ($(TARGET),x86_64-w64-mingw32) 35 ifneq ($(TARGET),x86_64-w64-mingw32)
36 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ 36 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
37 --libdir='$(BUILD_TOOLS_PREFIX)/lib' \ 37 --libdir='$(BUILD_TOOLS_PREFIX)/lib' \
38 --with-native-system-header-dir='/include' \ 38 --with-native-system-header-dir='/include' \
39 --disable-sjlj-exceptions 39 --disable-sjlj-exceptions
40 else 40 else
41 define $(PKG)_PRE_BUILD 41 define $(PKG)_PRE_BUILD
42 echo "Shortcuts" 42 echo "Shortcuts"
43 # create shortcuts 43 # create shortcuts
44 if ! [ -L $(HOST_PREFIX)/lib64 ]; then \ 44 if ! [ -L $(HOST_PREFIX)/lib64 ]; then \
95 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ 95 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
96 --target='$(TARGET)' \ 96 --target='$(TARGET)' \
97 --build='$(BUILD_SYSTEM)' \ 97 --build='$(BUILD_SYSTEM)' \
98 --with-as='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-as' \ 98 --with-as='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-as' \
99 --with-ld='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ld' \ 99 --with-ld='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ld' \
100 --with-nm='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-nm' 100 --with-nm='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-nm' \
101 --disable-multilib --with-host-libstdcxx="-lstdc++" --with-system-zlib
101 102
102 ifeq ($(ENABLE_WINDOWS_64),yes) 103 ifeq ($(ENABLE_WINDOWS_64),yes)
103 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += --with-sysroot='$(BUILD_TOOLS_PREFIX)' \ 104 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
104 --disable-multilib --with-host-libstdcxx="-lstdc++" --with-system-zlib \
105 --enable-64bit --enable-fully-dynamic-string 105 --enable-64bit --enable-fully-dynamic-string
106 else
107 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += --with-sysroot='$(HOST_PREFIX)' \
108 --disable-multilib
109 endif 106 endif
110 else 107 else
111 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ 108 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
112 --disable-multilib 109 --disable-multilib
113 endif 110 endif