v.io/jiri: add policy driven flags for merging environment variables.
- Also tidy up v23-profile env, list etc.
MultiPart: 3/11
Change-Id: I93daa072459850050fb78976e6d260129c8de516
diff --git a/Makefile b/Makefile
index e10cbd7..8dc3eb4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-NODE_DIR := $(shell jiri v23-profile env --profile=nodejs V23_TARGET_INSTALLATION_DIR=)
+NODE_DIR := $(shell jiri v23-profile list --info Target.InstallationDir nodejs)
PATH := node_modules/.bin:$(NODE_DIR)/bin:$(PATH)
NODE_BIN := $(JIRI_ROOT)/release/javascript/core/node_modules/.bin
diff --git a/extension/Makefile b/extension/Makefile
index 7bed861..cc38cc3 100644
--- a/extension/Makefile
+++ b/extension/Makefile
@@ -1,4 +1,4 @@
-NODE_DIR := $(shell jiri v23-profile env --profile=nodejs V23_TARGET_INSTALLATION_DIR=)
+NODE_DIR := $(shell jiri v23-profile list --info Target.InstallationDir nodejs)
PATH := node_modules/.bin:${NODE_DIR}/bin:$(PATH)
WSPR_ROOT := $(JIRI_ROOT)/release/go/src/v.io/x/ref/services/wspr
SHELL := /bin/bash -e -o pipefail
@@ -25,8 +25,8 @@
fi; \
if [ -f "$(JIRI_ROOT)/.jiri_v23_profiles" -a ! -z "`jiri v23-profile list nacl`" ]; then \
echo ">>>>>>> using new profiles"; \
- echo GOOS=nacl GOARCH=amd64p32 jiri go --profiles=nacl --target=amd64p32-nacl build -o $2 $1; \
- GOOS=nacl GOARCH=amd64p32 jiri -v go -v --profiles=nacl --target=amd64p32-nacl build -v -o $2 $1; \
+ echo "unset GOARCH GOOS; jiri go --profiles=nacl --target=amd64p32-nacl build -o $2 $1"; \
+ unset GOARCH GOOS; jiri -v go -v --profiles=nacl --target=amd64p32-nacl build -v -o $2 $1; \
else \
echo ">>>>>>> using old profiles"; \
echo GOROOT= JIRI_PROFILE=nacl jiri go build -o $2 $1; \
