From cdaf4779120d916675eb136e07872ad8dd91f2aa Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Mon, 28 Sep 2015 16:08:42 +0100 Subject: [PATCH] Use make TARGET_LINKER= instead of overriding linker flags. This solves building mips32 with gcc. That's a temporary measure until we can set a custom target. Change-Id: I1e8acfb0f5ca7e28d2ba3fb230b42800d5782973 --- tools/buildbot-build.sh | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh index a670fc773..972e82766 100755 --- a/tools/buildbot-build.sh +++ b/tools/buildbot-build.sh @@ -68,20 +68,14 @@ if [[ $mode == "host" ]]; then echo "Executing $make_command" $make_command elif [[ $mode == "target" ]]; then - # We need to provide our own linker in case the linker on the device - # is out of date. - env="TARGET_GLOBAL_LDFLAGS=-Wl,-dynamic-linker=$android_root/bin/$linker" - # gcc gives a linker error, so compile with clang. - # TODO: investigate and fix? - if [[ $TARGET_PRODUCT == "mips32r2_fp" ]]; then - env="$env USE_CLANG_PLATFORM_BUILD=true" - fi - # Disable NINJA for building on target, it does not support the -e option to Makefile. + # Disable NINJA for building on target, it does not support setting environment variables + # within the make command. env="$env USE_NINJA=false" - # Use '-e' to force the override of TARGET_GLOBAL_LDFLAGS. - # Also, we build extra tools that will be used by tests, so that + # Build extra tools that will be used by tests, so that # they are compiled with our own linker. - make_command="make -e $j_arg $showcommands build-art-target-tests $common_targets libjavacrypto libjavacoretests linker toybox toolbox sh out/host/linux-x86/bin/adb" + # We need to provide our own linker in case the linker on the device + # is out of date. + make_command="make TARGET_LINKER=$android_root/bin/$linker $j_arg $showcommands build-art-target-tests $common_targets libjavacrypto libjavacoretests linker toybox toolbox sh out/host/linux-x86/bin/adb" echo "Executing env $env $make_command" env $env $make_command fi -- 2.11.0