Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding variable for make args, ignore .vscode dir #228

Merged
merged 1 commit into from
Feb 17, 2021
Merged

Adding variable for make args, ignore .vscode dir #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.code
.idea
.vscode
build

*.tar.gz
Expand Down Expand Up @@ -127,4 +128,4 @@ dist/
*.background.tiff

# spv
!src/spv/Makefile
!src/spv/Makefile
4 changes: 3 additions & 1 deletion make.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ setup_vars() {
RELEASE_DIR=${RELEASE_DIR:-"./build"}

EXTRA_BUILD_OPTS=${EXTRA_BUILD_OPTS:-}
EXTRA_MAKE_ARGS=${EXTRA_MAKE_ARGS:-}

# shellcheck disable=SC2206
# This intentionally word-splits the array as env arg can only be strings.
Expand Down Expand Up @@ -74,6 +75,7 @@ help() {
build() {
local target=${1:-"x86_64-pc-linux-gnu"}
local extra_build_opts=${EXTRA_BUILD_OPTS:-}
local extra_make_args=${EXTRA_MAKE_ARGS:-}

echo "> build: ${target}"
pushd ./depends >/dev/null
Expand All @@ -83,7 +85,7 @@ build() {
./autogen.sh
# XREF: #make-configure
./configure --prefix="$(pwd)/depends/${target}" ${extra_build_opts}
make
make $extra_make_args
}

deploy() {
Expand Down