diff options
| -rwxr-xr-x | build-gdb.sh | 10 | ||||
| -rwxr-xr-x | build.py | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/build-gdb.sh b/build-gdb.sh index 334b3c73a..dbf9e8522 100755 --- a/build-gdb.sh +++ b/build-gdb.sh @@ -160,7 +160,7 @@ build_expat () need_build_expat () { - bh_stamps_do host-expat-$1 build_expat $1 + bh_do build_expat $1 } # $1: host system tag @@ -218,7 +218,7 @@ build_host_gdb () need_build_host_gdb () { - bh_stamps_do host-gdb-$1-$2-$3 build_host_gdb $1 $2 $3 + bh_do build_host_gdb $1 $2 $3 } # Install host GDB binaries and support files to the NDK install dir. @@ -275,7 +275,7 @@ install_host_gdb () need_install_host_gdb () { - bh_stamps_do install-host-gdb-$1-$2-$3 install_host_gdb $1 $2 $3 + bh_do install_host_gdb $1 $2 $3 } # Package host GDB binaries into a tarball @@ -288,8 +288,6 @@ package_host_gdb () local PACKAGENAME=$(gdb_ndk_package_name $1 $2 $3).tar.bz2 local PACKAGE="$PACKAGE_DIR/$PACKAGENAME" - need_install_host_gdb $1 $2 $3 - bh_set_target_tag $2 dump "$(bh_host_text) $PACKAGENAME: Packaging" @@ -314,7 +312,7 @@ if [ "$PACKAGE_DIR" ]; then bh_setup_build_for_host $SYSTEM for ARCH in $ARCHS; do for VERSION in $GDB_VERSION; do - bh_stamps_do package_host_gdb-$SYSTEM-$ARCH-$VERSION package_host_gdb $SYSTEM android-$ARCH $VERSION + bh_do package_host_gdb $SYSTEM android-$ARCH $VERSION done done done @@ -123,11 +123,11 @@ def main(): print('Building {} gdb: {}'.format(host, ' '.join(toolchains))) build_cmd = [ 'bash', 'build-gdb.sh', "--toolchain-src-dir=" + toolchain_path, - "--ndk-dir=" + ndk_path, + "--ndk-dir=" + ndk_path, '--verbose', "--arch=" + ",".join([toolchain_to_arch(tc) for tc in toolchains]), package_dir_arg, jobs_arg, ] - print(build_cmd) + print(' '.join(build_cmd)) subprocess.check_call(build_cmd, env=build_env) |