From 2fd8a1e0e0c1918013b3c9dfb7651721fad0ab61 Mon Sep 17 00:00:00 2001 From: jow Date: Sun, 12 Aug 2012 13:27:49 +0000 Subject: [PATCH] [tools] convert remaining tools to $(HOST_STATIC_LINKING) (#12012) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33148 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- tools/lzma/Makefile | 4 ++-- tools/mkimage/Makefile | 2 +- tools/padjffs2/Makefile | 2 +- tools/sed/Makefile | 2 +- tools/squashfs4/Makefile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/lzma/Makefile b/tools/lzma/Makefile index 00ed3dc42..6e01051a3 100644 --- a/tools/lzma/Makefile +++ b/tools/lzma/Makefile @@ -21,8 +21,8 @@ UTIL_DIR=$(HOST_BUILD_DIR)/C/LzmaUtil ALONE_DIR=$(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone define Host/Compile - $(MAKE) -C $(UTIL_DIR) -f makefile.gcc LDFLAGS="-static" - $(MAKE) -C $(ALONE_DIR) -f makefile.gcc LDFLAGS="-static" + $(MAKE) -C $(UTIL_DIR) -f makefile.gcc LDFLAGS="$(HOST_STATIC_LINKING)" + $(MAKE) -C $(ALONE_DIR) -f makefile.gcc LDFLAGS="$(HOST_STATIC_LINKING)" endef define Host/Install diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile index e26d6b75c..373d9bebb 100644 --- a/tools/mkimage/Makefile +++ b/tools/mkimage/Makefile @@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/host-build.mk define Host/Compile rm -f $(HOST_BUILD_DIR)/tools/.depend touch $(HOST_BUILD_DIR)/include/config.h - $(MAKE) -C $(HOST_BUILD_DIR) BUILD_DIR= BIN_FILES-y="mkimage" HOSTLDFLAGS="-static" tools + $(MAKE) -C $(HOST_BUILD_DIR) BUILD_DIR= BIN_FILES-y="mkimage" HOSTLDFLAGS="$(HOST_STATIC_LINKING)" tools endef define Host/Install diff --git a/tools/padjffs2/Makefile b/tools/padjffs2/Makefile index 3f033c0c2..4535735d6 100644 --- a/tools/padjffs2/Makefile +++ b/tools/padjffs2/Makefile @@ -19,7 +19,7 @@ define Host/Prepare endef define Host/Compile - $(MAKE) -C $(HOST_BUILD_DIR) LDFLAGS="-static" + $(MAKE) -C $(HOST_BUILD_DIR) LDFLAGS="$(HOST_STATIC_LINKING)" endef define Host/Configure diff --git a/tools/sed/Makefile b/tools/sed/Makefile index 210feceb7..522ae70d8 100644 --- a/tools/sed/Makefile +++ b/tools/sed/Makefile @@ -27,7 +27,7 @@ HOST_CONFIGURE_VARS += \ ac_cv_header_selinux_selinux_h=no \ define Host/Compile - $(MAKE) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" LDFLAGS="-static" + $(MAKE) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" LDFLAGS="$(HOST_STATIC_LINKING)" endef define Host/Install diff --git a/tools/squashfs4/Makefile b/tools/squashfs4/Makefile index 4b917c59c..b838b46c5 100644 --- a/tools/squashfs4/Makefile +++ b/tools/squashfs4/Makefile @@ -26,7 +26,7 @@ define Host/Compile XATTR_SUPPORT= \ LZMA_LIB="$(STAGING_DIR_HOST)/lib/liblzma.a" \ EXTRA_CFLAGS="-I$(STAGING_DIR_HOST)/include" \ - EXTRA_LDFLAGS="-static" \ + EXTRA_LDFLAGS="$(HOST_STATIC_LINKING)" \ mksquashfs unsquashfs endef