Remove old re2 dependency check compatibility shim (#1818)

Remove checkRE2_124 since we haven't supported <= 1.24 in some time.
Bears-R-Us · Oct 3, 2022 · 067f91b · 067f91b
1 parent 1cd27ee
commit 067f91b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -185,10 +185,7 @@ check-hdf5: $(HDF5_CHECK)
 	$(DEP_INSTALL_DIR)/$@ -nl 1
 	@rm -f $(DEP_INSTALL_DIR)/$@ $(DEP_INSTALL_DIR)/$@_real
 
-RE2_CHECK = $(DEP_INSTALL_DIR)/checkRE2_125.chpl
-ifneq ($(shell expr $(CHPL_MINOR) \>= 25),1)
-	RE2_CHECK = $(DEP_INSTALL_DIR)/checkRE2_124.chpl
-endif
+RE2_CHECK = $(DEP_INSTALL_DIR)/checkRE2.chpl
 check-re2: $(RE2_CHECK)
 	@echo "Checking for RE2"
 	$(CHPL) $(CHPL_FLAGS) $< -o $(DEP_INSTALL_DIR)/$@

diff --git a/dep/checkRE2_125.chpl → dep/checkRE2.chpl b/dep/checkRE2_125.chpl → dep/checkRE2.chpl
diff --git a/dep/checkRE2_124.chpl b/dep/checkRE2_124.chpl