From 79dc08f8acf3a5b9f2a74458cb65a75eecf3f074 Mon Sep 17 00:00:00 2001 From: Pat Hickey Date: Fri, 13 Dec 2019 13:01:30 -0800 Subject: [PATCH] review feedback --- Makefile | 5 +++-- deb_from_installation.sh | 2 +- tar_from_installation.sh | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 552c951..28996c6 100644 --- a/Makefile +++ b/Makefile @@ -149,11 +149,12 @@ build: build/llvm.BUILT build/wasi-libc.BUILT build/compiler-rt.BUILT build/libc strip: build/llvm.BUILT cd $(PREFIX)/bin; strip clang-9 lld llvm-ar -package: dist +package: build/package.BUILT -dist: build strip +build/package.BUILT: build strip mkdir -p dist command -v dpkg-deb >/dev/null && ./deb_from_installation.sh $(shell pwd)/dist || true ./tar_from_installation.sh $(shell pwd)/dist + touch built/package.BUILT .PHONY: default clean build strip package diff --git a/deb_from_installation.sh b/deb_from_installation.sh index 19037d4..5858306 100755 --- a/deb_from_installation.sh +++ b/deb_from_installation.sh @@ -3,7 +3,7 @@ set -ex if [ -n "$1" ]; then OUTDIR=$1 else - OUTDIR=$PWD/build + OUTDIR=$PWD/dist fi if [ -n "$2" ]; then diff --git a/tar_from_installation.sh b/tar_from_installation.sh index 634cd1f..2ac2179 100755 --- a/tar_from_installation.sh +++ b/tar_from_installation.sh @@ -3,7 +3,7 @@ set -ex if [ -n "$1" ]; then OUTDIR=$1 else - OUTDIR=$PWD/build + OUTDIR=$PWD/dist fi if [ -n "$2" ]; then