diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-06-10 22:24:28 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-06-10 22:24:28 +0000 |
| commit | 73ddb41748aee38cab461df4cc22d40df03afdf1 (patch) | |
| tree | e16bde3c258ed7a59f4cab549bfa123248264f42 | |
| parent | af06655268ef77ba6d0fcba76fd9f8f27b9a58c1 (diff) | |
| download | upstream-73ddb41748aee38cab461df4cc22d40df03afdf1.tar.gz upstream-73ddb41748aee38cab461df4cc22d40df03afdf1.tar.bz2 upstream-73ddb41748aee38cab461df4cc22d40df03afdf1.zip | |
toolchain: remove target dependencies on libgcc/libgfortran, add checks to package install template instead
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32176 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/toolchain/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/package/toolchain/Makefile b/package/toolchain/Makefile index 227f302a9f..c8105c30d3 100644 --- a/package/toolchain/Makefile +++ b/package/toolchain/Makefile @@ -28,7 +28,6 @@ endef define Package/libgcc $(call Package/gcc/Default) TITLE:=GCC support library - DEPENDS+=@!(TARGET_avr32||TARGET_coldfire) endef define Package/libgcc/config @@ -111,9 +110,7 @@ define Package/libc/Default SECTION:=libs CATEGORY:=Base system VERSION:=$(LIBC_VERSION)-$(PKG_RELEASE) -ifeq ($(TARGET_avr32)$(TARGET_coldfire),) DEPENDS:=+libgcc -endif URL:=$(LIBC_URL) PKG_FLAGS:=hold essential endef @@ -201,7 +198,7 @@ endef define Package/libgfortran $(call Package/gcc/Default) TITLE:=GFortran support library - DEPENDS+=@!(TARGET_avr32||TARGET_coldfire) @INSTALL_GFORTRAN + DEPENDS+=@INSTALL_GFORTRAN endef define Package/libgfortran/config @@ -358,12 +355,12 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) define Package/libgcc/install $(INSTALL_DIR) $(1)/lib - $(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/ + $(if $(TARGET_avr32)$(TARGET_coldfire),,$(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/) endef define Package/libgfortran/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(TOOLCHAIN_DIR)/lib/libgfortran.so.* $(1)/usr/lib/ + $(if $(TARGET_avr32)$(TARGET_coldfire),,$(CP) $(TOOLCHAIN_DIR)/lib/libgfortran.so.* $(1)/usr/lib/) endef define Package/libssp/install |