Skip to content

Commit 26be1fb

Browse files
committed
external_deps: reusable PKG_TARBALL
1 parent 710f53b commit 26be1fb

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

external_deps/build.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,20 +1275,20 @@ build_install() {
12751275
# Create a redistributable package for the dependencies
12761276
build_package() {
12771277
cd "${WORK_DIR}"
1278-
rm -f "${PKG_BASEDIR}.tar.xz"
1278+
rm -f "${PKG_TARBALL}"
12791279
local XZ_OPT='-9'
12801280
case "${PLATFORM}" in
12811281
windows-*-*)
1282-
tar --dereference -cvJf "${PKG_BASEDIR}.tar.xz" "${PKG_BASEDIR}"
1282+
tar --dereference -cvJf "${PKG_TARBALL}" "${PKG_BASEDIR}"
12831283
;;
12841284
*)
1285-
tar -cvJf "${PKG_BASEDIR}.tar.xz" "${PKG_BASEDIR}"
1285+
tar -cvJf "${PKG_TARBALL}" "${PKG_BASEDIR}"
12861286
;;
12871287
esac
12881288
}
12891289

12901290
build_wipe() {
1291-
rm -rf "${BUILD_BASEDIR}/" "${PKG_BASEDIR}/" "${PKG_BASEDIR}.tar.xz"
1291+
rm -rf "${BUILD_BASEDIR}/" "${PKG_BASEDIR}/" "${PKG_TARBALL}"
12921292
}
12931293

12941294
# Common setup code
@@ -1300,6 +1300,7 @@ common_setup() {
13001300

13011301
DOWNLOAD_DIR="${WORK_DIR}/download_cache"
13021302
PKG_BASEDIR="${PLATFORM}_${DEPS_VERSION}"
1303+
PKG_TARBALL="${PKG_BASEDIR}.tar.xz"
13031304
BUILD_BASEDIR="build-${PKG_BASEDIR}"
13041305
BUILD_DIR="${WORK_DIR}/${BUILD_BASEDIR}"
13051306
PREFIX="${BUILD_DIR}/prefix"

0 commit comments

Comments
 (0)