introduce `NIMC` to control which `nim` to call (#53)
This commit is contained in:
parent
dc535cd462
commit
8c59324e8f
|
@ -47,7 +47,7 @@ update: | update-common
|
|||
# building Nim programs
|
||||
foo bar: | build deps
|
||||
echo -e $(BUILD_MSG) "build/$@" && \
|
||||
$(ENV_SCRIPT) nim c -o:build/$@ $(NIM_PARAMS) "$@.nim"
|
||||
$(ENV_SCRIPT) "$(NIMC)" c -o:build/$@ $(NIM_PARAMS) "$@.nim"
|
||||
|
||||
clean: | clean-common
|
||||
rm -rf build/{foo,bar}
|
||||
|
|
|
@ -15,6 +15,8 @@ CC ?= gcc
|
|||
endif
|
||||
LD := $(CC)
|
||||
|
||||
NIMC ?= nim
|
||||
|
||||
#- extra parameters for the Nim compiler
|
||||
#- NIMFLAGS should come from the environment or make's command line
|
||||
NIM_PARAMS := $(NIMFLAGS)
|
||||
|
|
|
@ -11,6 +11,8 @@
|
|||
## get native Windows paths on Mingw
|
||||
#uname | grep -qi mingw && PWD_CMD="pwd -W"
|
||||
|
||||
export NIMC=${NIMC:-nim}
|
||||
|
||||
# We use ${BASH_SOURCE[0]} instead of $0 to allow sourcing this file
|
||||
# and we fall back to a Zsh-specific special var to also support Zsh.
|
||||
export REL_PATH="$(dirname ${BASH_SOURCE[0]:-${(%):-%x}})"
|
||||
|
@ -34,7 +36,7 @@ export PATH="${NIMBLE_DIR}/bin:${PATH}"
|
|||
if [[ "$USE_SYSTEM_NIM" != "1" ]]; then
|
||||
export PATH="${NIM_PATH}:${PATH}"
|
||||
else
|
||||
echo "[using system Nim: $(which nim)]" 1>&2
|
||||
echo "[using system Nim: $(which $NIMC)]" 1>&2
|
||||
fi
|
||||
|
||||
if [[ -n "${NIM_COMMIT}" && "${NIM_COMMIT}" != "nimbus" ]]; then
|
||||
|
|
|
@ -32,5 +32,5 @@ cleanup() {
|
|||
[ -e "$NIMS" ] || { ln -s "$F" "$NIMS"; trap cleanup EXIT; }
|
||||
|
||||
# can't have an "exec" here or the EXIT pseudo-signal won't be triggered
|
||||
$(dirname $0)/env.sh nim "$@" "$NIMS"
|
||||
$(dirname $0)/env.sh "$NIMC" "$@" "$NIMS"
|
||||
|
||||
|
|
Loading…
Reference in New Issue