Skip to content

Commit 412962f

Browse files
committed
spack-setup is a real target; remove out of date version checks
1 parent a7746eb commit 412962f

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

stackinator/templates/Makefile

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% set pipejoiner = joiner('|') %}
22
-include Make.user
33

4-
.PHONY: compilers environments generate-config clean spack-setup
4+
.PHONY: compilers environments generate-config clean
55

66
all: environments
77

@@ -16,19 +16,9 @@ spack-setup: spack-version
1616
@printf "spack arch... " ; \
1717
arch="$$($(SANDBOX) $(SPACK) arch)"; \
1818
printf "%s\n" "$$arch"; \
19-
case "$$arch" in \
20-
*cray*) \
21-
echo "You are running on Cray, which is usually a bad idea, since it turns Spack into modules mode. Try running in an clean environment with env -i."; \
22-
exit 1 \
23-
;; \
24-
esac; \
2519
printf "spack version... "; \
2620
version="$$($(SANDBOX) $(SPACK) --version)"; \
2721
printf "%s\n" "$$version"; \
28-
if [ "$$version" != "$$(cat spack-version)" ]; then \
29-
echo "The spack version seems to have been changed in the meantime... remove ./spack-version if that was intended"; \
30-
exit 1; \
31-
fi; \
3222
printf "checking if spack concretizer works... "; \
3323
$(SANDBOX) $(SPACK_HELPER) -d spec zlib > $(BUILD_ROOT)/spack-bootstrap-output 2>&1; \
3424
if [ "$$?" != "0" ]; then \

0 commit comments

Comments
 (0)