From 331bae81cad0cbaf617a6def3a52bfc7028f1e6b Mon Sep 17 00:00:00 2001 From: klzgrad Date: Mon, 2 Dec 2019 16:09:09 +0800 Subject: [PATCH] Use ld for MIPS builds lld produces larger binaries that are incompatible with UPX. --- .travis.yml | 2 +- src/get-openwrt.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ac939c0985..91b5eec56e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ matrix: - name: "openwrt-mipsel_24kc" os: linux dist: bionic - env: EXTRA_FLAGS='target_cpu="mipsel" mips_arch_variant="r2" mips_float_abi="soft" mips_tune="24kc" use_allocator="none" use_allocator_shim=false is_openwrt=true ldso_path="/lib/ld-musl-mipsel-sf.so.1"' OPENWRT_FLAGS='arch=mipsel_24kc release=19.07.0-rc1 gcc_ver=7.4.0 target=ramips subtarget=rt305x' + env: EXTRA_FLAGS='target_cpu="mipsel" mips_arch_variant="r2" mips_float_abi="soft" mips_tune="24kc" use_allocator="none" use_allocator_shim=false is_openwrt=true ldso_path="/lib/ld-musl-mipsel-sf.so.1" use_lld=false' OPENWRT_FLAGS='arch=mipsel_24kc release=19.07.0-rc1 gcc_ver=7.4.0 target=ramips subtarget=rt305x' - name: "osx" os: osx osx_image: xcode10.2 diff --git a/src/get-openwrt.sh b/src/get-openwrt.sh index 60a9d27bf6..3c4c0b13f2 100755 --- a/src/get-openwrt.sh +++ b/src/get-openwrt.sh @@ -39,6 +39,9 @@ echo ' ./lib/libresolv.a ./lib/librt.a ./usr +*ld.bin ' >include.txt tar cf - -C $full_root . | tar xf - -C $sysroot --wildcards --wildcards-match-slash -T include.txt rm include.txt +cd $sysroot/*-openwrt-linux-musl/bin +mv .ld.bin ld