Skip to content

Commit

Permalink
Push required version back
Browse files Browse the repository at this point in the history
  • Loading branch information
bmcdonald3 committed Mar 11, 2024
1 parent aeb1f5c commit fc5169f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,12 @@ $(ARROW_O): $(ARROW_CPP) $(ARROW_H)

CHPL_MAJOR := $(shell $(CHPL) --version | sed -n "s/chpl version \([0-9]\)\.[0-9]*.*/\1/p")
CHPL_MINOR := $(shell $(CHPL) --version | sed -n "s/chpl version [0-9]\.\([0-9]*\).*/\1/p")
CHPL_VERSION_OK := $(shell test $(CHPL_MAJOR) -ge 2 -o $(CHPL_MINOR) -ge 32 && echo yes)
CHPL_VERSION_OK := $(shell test $(CHPL_MAJOR) -ge 2 -o $(CHPL_MINOR) -ge 31 && echo yes)
CHPL_VERSION_WARN := $(shell test $(CHPL_MAJOR) -eq 1 -a $(CHPL_MINOR) -le 32 && echo yes)
.PHONY: check-chpl
check-chpl:
ifneq ($(CHPL_VERSION_OK),yes)
$(error Chapel 1.32.0 or newer is required, found $(CHPL_MAJOR).$(CHPL_MINOR))
$(error Chapel 1.31.0 or newer is required, found $(CHPL_MAJOR).$(CHPL_MINOR))
endif
ifeq ($(CHPL_VERSION_WARN),yes)
$(warning Chapel 1.33.0 or newer is recommended, found $(CHPL_MAJOR).$(CHPL_MINOR))
Expand Down

0 comments on commit fc5169f

Please sign in to comment.