From bfec6a4eb36ea96fd199f6949794cdff264825a9 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Wed, 5 Dec 2018 10:56:02 +1100 Subject: [PATCH] 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 Reviewed-By: Richard Lau --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 803a1f96e71a4c..6fdd9b8d4b2850 100644 --- a/Makefile +++ b/Makefile @@ -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