Skip to content

Commit 34126a1

Browse files
haampieKristofferC
authored andcommitted
Fix detection of LIBGFORTRAN_VERSION (#44026)
(cherry picked from commit 1edafa0)
1 parent 21fd19b commit 34126a1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Make.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1172,7 +1172,7 @@ endif
11721172

11731173
# Auto-detect triplet once, create different versions that we use as defaults below for each BB install target
11741174
FC_VERSION := $(shell $(FC) --version 2>/dev/null | head -1)
1175-
FC_OR_CC_VERISON := $(or $(FC_VERSION),$(shell $(CC) --version 2>/dev/null | head -1))
1175+
FC_OR_CC_VERSION := $(or $(FC_VERSION),$(shell $(CC) --version 2>/dev/null | head -1))
11761176
BB_TRIPLET_LIBGFORTRAN_CXXABI := $(shell $(call invoke_python,$(JULIAHOME)/contrib/normalize_triplet.py) $(or $(XC_HOST),$(XC_HOST),$(BUILD_MACHINE)) "$(FC_OR_CC_VERSION)" "$(or $(shell echo '\#include <string>' | $(CXX) $(CXXFLAGS) -x c++ -dM -E - | grep _GLIBCXX_USE_CXX11_ABI | awk '{ print $$3 }' ),1)")
11771177
BB_TRIPLET_LIBGFORTRAN := $(subst $(SPACE),-,$(filter-out cxx%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI))))
11781178
BB_TRIPLET_CXXABI := $(subst $(SPACE),-,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI))))

0 commit comments

Comments
 (0)