From 0b66fd643e5da9bc132faff363d960363126c8ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Mon, 20 Nov 2023 18:12:24 +0100 Subject: [PATCH] fix: test for make presence in the buildsystem (#7234) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- scripts/env.sh | 2 +- scripts/setup.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/env.sh b/scripts/env.sh index 768cf1ea75..b051e4464e 100755 --- a/scripts/env.sh +++ b/scripts/env.sh @@ -32,7 +32,7 @@ if [[ $(uname -s) == 'Darwin' ]]; then else export CMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET:-11.0} fi - + CMAKE_FLAGS+=(-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}) export CFLAGS="$CFLAGS -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}" export CXXFLAGS="$CXXFLAGS -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}" diff --git a/scripts/setup.sh b/scripts/setup.sh index 0748545398..3bb73e524c 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -66,6 +66,7 @@ bun i cd test; bun i; cd .. # TODO(@paperdave): do not use the Makefile please +has_exec "make" || fail "'make' is missing" make runtime_js fallback_decoder bun_error node-fallbacks mkdir -p build