diff options
| author | Carl Dong <contact@carldong.me> | 2021-03-17 12:59:18 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2021-04-05 11:00:39 -0400 |
| commit | 7f401c953f8bb3574cec48561e13ef3b47dedc6e (patch) | |
| tree | f5a537255ce7490f861273e5a34dae4e075f1bd7 /contrib/guix/libexec | |
| parent | 4eccf063b252bfe256cf72d363a24cf0183e926e (diff) | |
guix: Adapt guix-build to prelude, restructure hier
Diffstat (limited to 'contrib/guix/libexec')
| -rw-r--r-- | contrib/guix/libexec/build.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 9888a84c9d..bb83516f89 100644 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -24,6 +24,8 @@ fi # Check that required environment variables are set cat << EOF Required environment variables as seen inside the container: + DIST_ARCHIVE_BASE: ${DIST_ARCHIVE_BASE:?not set} + DISTNAME: ${DISTNAME:?not set} HOST: ${HOST:?not set} SOURCE_DATE_EPOCH: ${SOURCE_DATE_EPOCH:?not set} JOBS: ${JOBS:?not set} @@ -198,11 +200,7 @@ make -C depends --jobs="$JOBS" HOST="$HOST" \ # Source Tarball Building # ########################### -# Define DISTNAME variable. -# shellcheck source=contrib/gitian-descriptors/assign_DISTNAME -source contrib/gitian-descriptors/assign_DISTNAME - -GIT_ARCHIVE="${OUTDIR}/src/${DISTNAME}.tar.gz" +GIT_ARCHIVE="${DIST_ARCHIVE_BASE}/${DISTNAME}.tar.gz" # Create the source tarball if not already there if [ ! -e "$GIT_ARCHIVE" ]; then @@ -275,6 +273,7 @@ mkdir -p "$DISTSRC" # version symbols for Linux distro back-compatibility. make -C src --jobs=1 check-symbols ${V:+V=1} + mkdir -p ${OUTDIR} # Make the os-specific installers case "$HOST" in *mingw*) |