23 lines
1.3 KiB
Diff
23 lines
1.3 KiB
Diff
From 23b8403586be314449c42b35b85d45be16a02373 Mon Sep 17 00:00:00 2001
|
|
From: Harmen Stoppels <harmenstoppels@gmail.com>
|
|
Date: Thu, 3 Feb 2022 01:56:41 +0100
|
|
Subject: [PATCH] Fix detection of LIBGFORTRAN_VERSION
|
|
|
|
---
|
|
Make.inc | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/Make.inc b/Make.inc
|
|
index 6b9db8d9fa33..ec956d1d0c86 100644
|
|
--- a/Make.inc
|
|
+++ b/Make.inc
|
|
@@ -1140,7 +1140,7 @@ endif
|
|
|
|
# Auto-detect triplet once, create different versions that we use as defaults below for each BB install target
|
|
FC_VERSION := $(shell $(FC) --version 2>/dev/null | head -1)
|
|
-FC_OR_CC_VERISON := $(or $(FC_VERSION),$(shell $(CC) --version 2>/dev/null | head -1))
|
|
+FC_OR_CC_VERSION := $(or $(FC_VERSION),$(shell $(CC) --version 2>/dev/null | head -1))
|
|
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)")
|
|
BB_TRIPLET_LIBGFORTRAN := $(subst $(SPACE),-,$(filter-out cxx%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI))))
|
|
BB_TRIPLET_CXXABI := $(subst $(SPACE),-,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI))))
|