From acfe8c4bfe603a40e191c950aef1bfe149dbc623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= Date: Thu, 30 Jan 2020 01:09:52 +0100 Subject: [PATCH] Revert "Azure no longer has /bin/bash" This reverts commit 4a4091141c425fc20e867b44813a4de598559a47. --- makefiles/targets.mk | 4 ++-- makefiles/variables.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/makefiles/targets.mk b/makefiles/targets.mk index bd35e26..1b4f3c5 100644 --- a/makefiles/targets.mk +++ b/makefiles/targets.mk @@ -50,7 +50,7 @@ build-nim: | sanity-checks CC=$(CC) \ MAKE=$(MAKE) \ ARCH_OVERRIDE=$(ARCH_OVERRIDE) \ - bash "$(CURDIR)/$(BUILD_SYSTEM_DIR)/scripts/build_nim.sh" "$(NIM_DIR)" ../Nim-csources ../nimble "$(CI_CACHE)" + "$(CURDIR)/$(BUILD_SYSTEM_DIR)/scripts/build_nim.sh" "$(NIM_DIR)" ../Nim-csources ../nimble "$(CI_CACHE)" #- "go.mod" can be changed by the Go compiler, preventing a checkout #- in case of submodule URL changes, propagates that change in the parent repo's .git directory @@ -97,7 +97,7 @@ endif $(NIMBLE_DIR): | $(NIM_BINARY) mkdir -p $(NIMBLE_DIR)/pkgs NIMBLE_DIR="$(CURDIR)/$(NIMBLE_DIR)" PWD_CMD="$(PWD)" \ - git submodule foreach --quiet 'bash $(CURDIR)/$(BUILD_SYSTEM_DIR)/scripts/create_nimble_link.sh "$$sm_path"' + git submodule foreach --quiet '$(CURDIR)/$(BUILD_SYSTEM_DIR)/scripts/create_nimble_link.sh "$$sm_path"' clean-common: rm -rf build/{*.exe,*.so,*.so.0} vendor/go/bin $(NIMBLE_DIR) $(NIM_BINARY) $(NIM_DIR)/bin/timestamp $(NIM_DIR)/nimcache nimcache diff --git a/makefiles/variables.mk b/makefiles/variables.mk index 4aa5fdc..1f80887 100644 --- a/makefiles/variables.mk +++ b/makefiles/variables.mk @@ -63,7 +63,7 @@ endif # we want a "recursively expanded" (delayed interpolation) variable here, so we can set CMD in rule recipes RUN_CMD_IN_ALL_REPOS = git submodule foreach --recursive --quiet 'echo -e "\n\e[32m$$name:\e[39m"; $(CMD)'; echo -e "\n\e[32m$$($(PWD)):\e[39m"; $(CMD) # absolute path, since it will be run at various subdirectory depths -ENV_SCRIPT := bash "$(CURDIR)/$(BUILD_SYSTEM_DIR)/scripts/env.sh" +ENV_SCRIPT := "$(CURDIR)/$(BUILD_SYSTEM_DIR)/scripts/env.sh" # duplicated in "env.sh" to prepend NIM_DIR/bin to PATH NIM_DIR := $(BUILD_SYSTEM_DIR)/vendor/Nim