diff --git a/Makefile b/Makefile index 789cdf9..13f3a61 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ TMP_DIR = $(PWD)/tmp-$(1) PKGS := $(shell $(SED) -n 's/^.* class="package">\([^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html') BUILD := $(shell '$(EXT_DIR)/config.guess') BUILD_PKGS := $(shell grep -l 'BUILD_$$(BUILD)' '$(TOP_DIR)/src/'*.mk | $(SED) -n 's,.*src/\(.*\)\.mk,\1,p') -PATH := $(PREFIX)/$(BUILD)/bin:$(PREFIX)/bin:$(PATH) +PATH := $(PREFIX)/bin:$(PATH) MXE_CONFIGURE_OPTS = \ --host='$(TARGET)' \ diff --git a/src/binutils.mk b/src/binutils.mk index a768cae..690020c 100644 --- a/src/binutils.mk +++ b/src/binutils.mk @@ -32,6 +32,8 @@ define $(PKG)_BUILD --disable-werror $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install + + rm -f $(addprefix $(PREFIX)/$(TARGET)/bin/, ar as dlltool ld ld.bfd nm objcopy objdump ranlib) endef $(PKG)_BUILD_$(BUILD) := diff --git a/src/gcc.mk b/src/gcc.mk index 209bf51..3dd9581 100644 --- a/src/gcc.mk +++ b/src/gcc.mk @@ -48,6 +48,9 @@ define $(PKG)_CONFIGURE --with-isl='$(PREFIX)' \ --with-mpc='$(PREFIX)' \ --with-mpfr='$(PREFIX)' \ + --with-as='$(PREFIX)/bin/$(TARGET)-as' \ + --with-ld='$(PREFIX)/bin/$(TARGET)-ld' \ + --with-nm='$(PREFIX)/bin/$(TARGET)-nm' \ $(shell [ `uname -s` == Darwin ] && echo "LDFLAGS='-Wl,-no_pie'") endef @@ -57,6 +60,8 @@ define $(PKG)_BUILD_i686-pc-mingw32 --disable-sjlj-exceptions $(MAKE) -C '$(1).build' -j '$(JOBS)' $(MAKE) -C '$(1).build' -j 1 install + + rm -f $(addprefix $(PREFIX)/$(TARGET)/bin/, strip c++ g++ gcc gfortran) endef define $(PKG)_BUILD_mingw-w64 @@ -79,6 +84,8 @@ define $(PKG)_BUILD_mingw-w64 cd '$(1).build' $(MAKE) -C '$(1).build' -j '$(JOBS)' $(MAKE) -C '$(1).build' -j 1 install + + rm -f $(addprefix $(PREFIX)/$(TARGET)/bin/, strip c++ g++ gcc gfortran) endef $(PKG)_BUILD_x86_64-w64-mingw32 = $(subst mxe-config-opts,--disable-lib32,$($(PKG)_BUILD_mingw-w64))