Author: jow Date: 2015-02-06 01:00:47 +0100 (Fri, 06 Feb 2015) New Revision: 44286
Modified: trunk/include/host-build.mk trunk/include/prereq-build.mk Log: include: remove static tool linking support Signed-off-by: Jo-Philipp Wich <[email protected]> Modified: trunk/include/host-build.mk =================================================================== --- trunk/include/host-build.mk 2015-02-06 00:00:43 UTC (rev 44285) +++ trunk/include/host-build.mk 2015-02-06 00:00:47 UTC (rev 44286) @@ -73,12 +73,6 @@ HOST_CONFIGURE_CMD = $(BASH) ./configure -ifneq ($(HOST_OS),Darwin) - ifeq ($(CONFIG_BUILD_STATIC_TOOLS),y) - HOST_STATIC_LINKING = -static - endif -endif - define Host/Configure/Default $(if $(HOST_CONFIGURE_PARALLEL),+)(cd $(HOST_BUILD_DIR)/$(3); \ if [ -x configure ]; then \ Modified: trunk/include/prereq-build.mk =================================================================== --- trunk/include/prereq-build.mk 2015-02-06 00:00:43 UTC (rev 44285) +++ trunk/include/prereq-build.mk 2015-02-06 00:00:47 UTC (rev 44286) @@ -68,25 +68,7 @@ echo 'int main(int argc, char **argv) { SSL_library_init(); return 0; }' | \ gcc -include openssl/ssl.h -x c -o $(TMP_DIR)/a.out - -lcrypto -lssl)) -ifneq ($(HOST_STATIC_LINKING),) - $(eval $(call TestHostCommand,working-gcc-static, \ - Please install the static libc development package (glibc-static on CentOS/Fedora/RHEL)., \ - echo 'int main(int argc, char **argv) { return 0; }' | \ - gcc -x c $(HOST_STATIC_LINKING) -o $(TMP_DIR)/a.out -)) - $(eval $(call TestHostCommand,working-g++-static, \ - Please install the static libstdc++ development package (libstdc++-static on CentOS/Fedora/RHEL)., \ - echo 'int main(int argc, char **argv) { return 0; }' | \ - g++ -x c++ $(HOST_STATIC_LINKING) -o $(TMP_DIR)/a.out - -lstdc++ && \ - $(TMP_DIR)/a.out)) - - $(eval $(call TestHostCommand,zlib-static, \ - Please install a static zlib. (zlib-static on CentOS/Fedora/RHEL)., \ - echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \ - gcc -include zlib.h -x c $(HOST_STATIC_LINKING) -o $(TMP_DIR)/a.out - -lz)) -endif - - $(eval $(call SetupHostCommand,tar,Please install GNU 'tar', \ gtar --version 2>&1 | grep GNU, \ gnutar --version 2>&1 | grep GNU, \ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
