diff options
| author | Rod Vagg <rod@vagg.org> | 2018-12-05 10:56:02 +1100 |
|---|---|---|
| committer | Ruben Bridgewater <ruben@bridgewater.de> | 2018-12-05 20:07:18 +0100 |
| commit | b054d5eadb0ece5a07c3771e6b2fba5407a2ef44 (patch) | |
| tree | a7c4a58e0cba5733b1358ff1650ee1ef670b6103 | |
| parent | e26eb08bad5f4322b4760b5924e1f79f8366db10 (diff) | |
| download | node-new-b054d5eadb0ece5a07c3771e6b2fba5407a2ef44.tar.gz | |
build: fix check-xz for platforms defaulting to sh
5e80a9a160 introduced check-xz, using `[[ .. ]]` syntax, but this is a
bash builtin and some platforms default to `sh` when doing
`$(shell ...)` in Makefiles.
Fix is to make it sh friendly.
Ref: https://github.com/nodejs/node/pull/24551
PR-URL: https://github.com/nodejs/node/pull/24841
Refs: https://github.com/nodejs/node/pull/24551
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -851,10 +851,10 @@ BINARYNAME=$(TARNAME)-$(PLATFORM)-$(ARCH) endif BINARYTAR=$(BINARYNAME).tar # OSX doesn't have xz installed by default, http://macpkg.sourceforge.net/ -HAS_XZ ?= $(shell which xz > /dev/null 2>&1; [[ $$? = 0 ]] && echo 1 || echo 0) +HAS_XZ ?= $(shell which xz > /dev/null 2>&1; [ $$? -eq 0 ] && echo 1 || echo 0) # Supply SKIP_XZ=1 to explicitly skip .tar.xz creation SKIP_XZ ?= 0 -XZ = $(shell [[ $(HAS_XZ) = 1 && $(SKIP_XZ) = 0 ]] && echo 1 || echo 0) +XZ = $(shell [ $(HAS_XZ) -eq 1 -a $(SKIP_XZ) -eq 0 ] && echo 1 || echo 0) XZ_COMPRESSION ?= 9e PKG=$(TARNAME).pkg MACOSOUTDIR=out/macos |