aboutsummaryrefslogtreecommitdiff
path: root/sources
diff options
context:
space:
mode:
Diffstat (limited to 'sources')
-rwxr-xr-xsources/host-tools/ndk-depends/build-ndk-depends.sh11
-rwxr-xr-xsources/host-tools/ndk-depends/build.py2
-rwxr-xr-xsources/host-tools/ndk-stack/build-ndk-stack.sh13
-rwxr-xr-xsources/host-tools/ndk-stack/build.py2
4 files changed, 4 insertions, 24 deletions
diff --git a/sources/host-tools/ndk-depends/build-ndk-depends.sh b/sources/host-tools/ndk-depends/build-ndk-depends.sh
index 981eff8d4..5f362b0ed 100755
--- a/sources/host-tools/ndk-depends/build-ndk-depends.sh
+++ b/sources/host-tools/ndk-depends/build-ndk-depends.sh
@@ -75,10 +75,8 @@ if [ "$MINGW" = "yes" ]; then
fi
NAME=$(get_host_exec_name ndk-depends)
-INSTALL_ROOT=$BUILD_DIR/install
INSTALL_SUBDIR=host-tools/bin
-INSTALL_PATH=$INSTALL_ROOT/$INSTALL_SUBDIR
-OUT=$INSTALL_PATH/$NAME
+OUT=$BUILD_DIR/$NAME
mkdir $INSTALL_PATH
# GNU Make
@@ -115,12 +113,5 @@ if [ $? != 0 ]; then
exit 1
fi
-if [ "$PACKAGE_DIR" ]; then
- ARCHIVE=ndk-depends-$HOST_TAG.tar.bz2
- dump "Packaging: $ARCHIVE"
- pack_archive "$PACKAGE_DIR/$ARCHIVE" "$INSTALL_ROOT" "$INSTALL_SUBDIR"
- fail_panic "Could not create package: $PACKAGE_DIR/$ARCHIVE from $OUT"
-fi
-
log "Done!"
exit 0
diff --git a/sources/host-tools/ndk-depends/build.py b/sources/host-tools/ndk-depends/build.py
index 57b9465b3..65dc54711 100755
--- a/sources/host-tools/ndk-depends/build.py
+++ b/sources/host-tools/ndk-depends/build.py
@@ -41,7 +41,7 @@ def main(args):
build_cmd.append(
'--build-dir=' + os.path.join(args.out_dir, 'ndk-depends'))
- build_support.build(build_cmd, args, intermediate_package=True)
+ build_support.build(build_cmd, args)
if __name__ == '__main__':
build_support.run(main)
diff --git a/sources/host-tools/ndk-stack/build-ndk-stack.sh b/sources/host-tools/ndk-stack/build-ndk-stack.sh
index 4d2a110e3..61a93e65d 100755
--- a/sources/host-tools/ndk-stack/build-ndk-stack.sh
+++ b/sources/host-tools/ndk-stack/build-ndk-stack.sh
@@ -101,11 +101,7 @@ run make -j$NUM_JOBS
fail_panic "Can't build $BINUTILS_SRC_DIR"
NAME=$(get_host_exec_name ndk-stack)
-INSTALL_ROOT=$BUILD_DIR/install
-INSTALL_SUBDIR=host-tools/bin
-INSTALL_PATH=$INSTALL_ROOT/$INSTALL_SUBDIR
-OUT=$INSTALL_PATH/$NAME
-mkdir $INSTALL_PATH
+OUT=$BUILD_DIR/$NAME
# GNU Make
if [ -z "$GNUMAKE" ]; then
@@ -162,12 +158,5 @@ if [ $? != 0 ]; then
exit 1
fi
-if [ "$PACKAGE_DIR" ]; then
- ARCHIVE=ndk-stack-$HOST_TAG.tar.bz2
- dump "Packaging: $ARCHIVE"
- pack_archive "$PACKAGE_DIR/$ARCHIVE" "$INSTALL_ROOT" "$INSTALL_SUBDIR"
- fail_panic "Could not create package: $PACKAGE_DIR/$ARCHIVE from $OUT"
-fi
-
log "Done!"
exit 0
diff --git a/sources/host-tools/ndk-stack/build.py b/sources/host-tools/ndk-stack/build.py
index 14ee57e33..72e42f055 100755
--- a/sources/host-tools/ndk-stack/build.py
+++ b/sources/host-tools/ndk-stack/build.py
@@ -40,7 +40,7 @@ def main(args):
build_cmd.append('--build-dir=' + os.path.join(args.out_dir, 'ndk-stack'))
- build_support.build(build_cmd, args, intermediate_package=True)
+ build_support.build(build_cmd, args)
if __name__ == '__main__':
build_support.run(main)