summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2017-02-03 09:31:31 (GMT)
committerTony Theodore <tonyt@logyst.com>2017-02-04 08:11:48 (GMT)
commitc6a3c2599368aa9052035b31d68ce69224ea3f68 (patch)
treea34d61887c554c320edf7748df14c3b8e380cb6b
parent7ab58c37198b11351e963a02b307ff3c0d396e0e (diff)
downloadmxe-c6a3c2599368aa9052035b31d68ce69224ea3f68.zip
mxe-c6a3c2599368aa9052035b31d68ce69224ea3f68.tar.gz
mxe-c6a3c2599368aa9052035b31d68ce69224ea3f68.tar.bz2
gcc cloog: remove unnecessary rules/variables/options
-rw-r--r--plugins/examples/host-toolchain/gcc-host.mk4
-rw-r--r--src/cloog.mk1
-rw-r--r--src/gcc.mk9
3 files changed, 2 insertions, 12 deletions
diff --git a/plugins/examples/host-toolchain/gcc-host.mk b/plugins/examples/host-toolchain/gcc-host.mk
index 8dd35da..bab48e1 100644
--- a/plugins/examples/host-toolchain/gcc-host.mk
+++ b/plugins/examples/host-toolchain/gcc-host.mk
@@ -9,7 +9,7 @@ $(PKG)_FILE = $(gcc_FILE)
$(PKG)_PATCHES = $(realpath $(sort $(wildcard $(addsuffix /gcc-[0-9]*.patch, $(TOP_DIR)/src))))
$(PKG)_URL = $(gcc_URL)
$(PKG)_URL_2 = $(gcc_URL_2)
-$(PKG)_DEPS := gcc binutils-host cloog gmp isl mpfr mpc pthreads
+$(PKG)_DEPS := gcc binutils-host gmp isl mpfr mpc pthreads
define $(PKG)_UPDATE
echo $(gcc_VERSION)
@@ -35,7 +35,7 @@ define $(PKG)_BUILD
--disable-win32-registry \
--enable-threads=$(MXE_GCC_THREADS) \
--enable-libgomp \
- --with-{cloog,gmp,isl,mpc,mpfr}='$(PREFIX)/$(TARGET)' \
+ --with-{gmp,isl,mpc,mpfr}='$(PREFIX)/$(TARGET)' \
$($(PKG)_CONFIGURE_OPTS)
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
diff --git a/src/cloog.mk b/src/cloog.mk
index 0124f68..d5d6758 100644
--- a/src/cloog.mk
+++ b/src/cloog.mk
@@ -10,7 +10,6 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://www.bastoul.net/cloog/pages/download/$($(PKG)_FILE)
$(PKG)_URL_2 := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
-$(PKG)_TARGETS := $(MXE_TARGETS)
$(PKG)_DEPS := gcc gmp isl
define $(PKG)_UPDATE
diff --git a/src/gcc.mk b/src/gcc.mk
index b415910..b9303fe 100644
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -12,8 +12,6 @@ $(PKG)_URL := http://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)
$(PKG)_URL_2 := ftp://ftp.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := binutils mingw-w64
-$(PKG)_FILE_$(BUILD) :=
-
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://ftp.gnu.org/gnu/gcc/?C=M;O=D' | \
$(SED) -n 's,.*<a href="gcc-\([0-9][^"]*\)/".*,\1,p' | \
@@ -44,7 +42,6 @@ define $(PKG)_CONFIGURE
--with-isl='$(PREFIX)/$(BUILD)' \
--with-mpc='$(PREFIX)/$(BUILD)' \
--with-mpfr='$(PREFIX)/$(BUILD)' \
- --with-cloog='$(PREFIX)/$(BUILD)' \
--with-as='$(PREFIX)/bin/$(TARGET)-as' \
--with-ld='$(PREFIX)/bin/$(TARGET)-ld' \
--with-nm='$(PREFIX)/bin/$(TARGET)-nm' \
@@ -119,9 +116,3 @@ endef
$(PKG)_BUILD_x86_64-w64-mingw32 = $(subst @gcc-crt-config-opts@,--disable-lib32,$($(PKG)_BUILD_mingw-w64))
$(PKG)_BUILD_i686-w64-mingw32 = $(subst @gcc-crt-config-opts@,--disable-lib64,$($(PKG)_BUILD_mingw-w64))
-
-define $(PKG)_BUILD_$(BUILD)
- for f in c++ cpp g++ gcc gcov; do \
- ln -sf "`which $$f`" '$(PREFIX)/bin/$(TARGET)'-$$f ; \
- done
-endef