Mercurial > mxe-octave

comparison src/build-binutils.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 4f00764eb5c2
children 5da1d6de7f6f
comparison
equal deleted inserted replaced
4625:b8385340a96a 4626:b864dc772f15
10 $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/binutils/$($(PKG)_FILE) 10 $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/binutils/$($(PKG)_FILE)
11 $(PKG)_URL_2 := ftp://ftp.cs.tu-berlin.de/pub/gnu/binutils/$($(PKG)_FILE) 11 $(PKG)_URL_2 := ftp://ftp.cs.tu-berlin.de/pub/gnu/binutils/$($(PKG)_FILE)
12 $(PKG)_DEPS := 12 $(PKG)_DEPS :=
13 13
14 ifneq ($(MXE_NATIVE_BUILD),yes) 14 ifneq ($(MXE_NATIVE_BUILD),yes)
15 ifneq ($(ENABLE_WINDOWS_64),yes)
16 define $(PKG)_POST_BUILD
17 $(INSTALL) -d '$(3)/$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)'
18 mv $(addprefix $(3)/$(HOST_PREFIX)/bin/, ar as dlltool ld ld.bfd nm objcopy objdump ranlib strip) '$(3)/$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)'
19 endef
20 else
21 define $(PKG)_POST_BUILD 15 define $(PKG)_POST_BUILD
22 rm $(addprefix $(3)/$(HOST_PREFIX)/bin/, ar as dlltool ld ld.bfd nm objcopy objdump ranlib strip) 16 rm $(addprefix $(3)/$(HOST_PREFIX)/bin/, ar as dlltool ld ld.bfd nm objcopy objdump ranlib strip)
23 endef 17 endef
24 endif
25 endif 18 endif
26 19
27 define $(PKG)_UPDATE 20 define $(PKG)_UPDATE
28 $(WGET) -q -O- 'http://ftp.gnu.org/gnu/binutils/?C=M;O=D' | \ 21 $(WGET) -q -O- 'http://ftp.gnu.org/gnu/binutils/?C=M;O=D' | \
29 $(SED) -n 's,.*<a href="binutils-\([0-9][^"]*\)\.tar.*,\1,p' | \ 22 $(SED) -n 's,.*<a href="binutils-\([0-9][^"]*\)\.tar.*,\1,p' | \
35 $(PKG)_DEPS += build-gcc 28 $(PKG)_DEPS += build-gcc
36 else 29 else
37 $(PKG)_SYSDEP_CONFIGURE_OPTIONS := \ 30 $(PKG)_SYSDEP_CONFIGURE_OPTIONS := \
38 --target='$(TARGET)' \ 31 --target='$(TARGET)' \
39 --build='$(BUILD_SYSTEM)' \ 32 --build='$(BUILD_SYSTEM)' \
40 33 --libdir='$(BUILD_TOOLS_PREFIX)/lib' \
41 ifeq ($(ENABLE_WINDOWS_64),yes) 34 --disable-multilib \
42 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ 35 --with-sysroot='$(HOST_PREFIX)'
43 --enable-multilib \
44 --with-sysroot='$(BUILD_TOOLS_PREFIX)' \
45 --enable-targets=x86_64-w64-mingw32,i686-w64-mingw32
46 else
47 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
48 --libdir='$(BUILD_TOOLS_PREFIX)/lib' \
49 --disable-multilib \
50 --with-sysroot='$(HOST_PREFIX)'
51 endif
52 endif 36 endif
53 37
54 define $(PKG)_BUILD 38 define $(PKG)_BUILD
55 # install config.guess for general use 39 # install config.guess for general use
56 $(INSTALL) -d '$(3)/$(BUILD_TOOLS_PREFIX)/bin' 40 $(INSTALL) -d '$(3)/$(BUILD_TOOLS_PREFIX)/bin'