status-im
/
nimbus-build-system
mirror of https://github.com/status-im/nimbus-build-system.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Azure no longer has /bin/bash" 

This reverts commit 4a4091141c.
This commit is contained in:
Ștefan Talpalaru 2020-01-30 01:09:52 +01:00
parent 4a4091141c
commit acfe8c4bfe
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefiles/targets.mk
View File

@ -50,7 +50,7 @@ build-nim: | sanity-checks
CC=$(CC) \ CC=$(CC) \
MAKE=$(MAKE) \ MAKE=$(MAKE) \
ARCH_OVERRIDE=$(ARCH_OVERRIDE) \ 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 #- "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 #- 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) $(NIMBLE_DIR): | $(NIM_BINARY)
mkdir -p $(NIMBLE_DIR)/pkgs mkdir -p $(NIMBLE_DIR)/pkgs
NIMBLE_DIR="$(CURDIR)/$(NIMBLE_DIR)" PWD_CMD="$(PWD)" \ 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: clean-common:
rm -rf build/{*.exe,*.so,*.so.0} vendor/go/bin $(NIMBLE_DIR) $(NIM_BINARY) $(NIM_DIR)/bin/timestamp $(NIM_DIR)/nimcache nimcache rm -rf build/{*.exe,*.so,*.so.0} vendor/go/bin $(NIMBLE_DIR) $(NIM_BINARY) $(NIM_DIR)/bin/timestamp $(NIM_DIR)/nimcache nimcache

2
makefiles/variables.mk
View File

@ -63,7 +63,7 @@ endif
# we want a "recursively expanded" (delayed interpolation) variable here, so we can set CMD in rule recipes # 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) 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 # 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 # duplicated in "env.sh" to prepend NIM_DIR/bin to PATH
NIM_DIR := $(BUILD_SYSTEM_DIR)/vendor/Nim NIM_DIR := $(BUILD_SYSTEM_DIR)/vendor/Nim