From 3d17825eed9fc652251897f8177b0ce3c7d408ed Mon Sep 17 00:00:00 2001
From: Simone Bna <simone.bna@cineca.it>
Date: Mon, 7 Nov 2022 17:10:41 +0100
Subject: [PATCH] BUG: replced with AMDClang general includes
---
wmake/rules/linux64AMDClang/c | 4 ++--
wmake/rules/linux64AMDClang/c++ | 10 +++++-----
wmake/rules/linux64AMDClang/general | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/wmake/rules/linux64AMDClang/c b/wmake/rules/linux64AMDClang/c
index bba9283dc21..008ca22f022 100644
--- a/wmake/rules/linux64AMDClang/c
+++ b/wmake/rules/linux64AMDClang/c
@@ -1,5 +1,5 @@
#------------------------------------------------------------------------------
-include $(GENERAL_RULES)/Clang/c
+include $(GENERAL_RULES)/AMDClang/c
cARCH = -m64
@@ -12,6 +12,6 @@ cFLAGS = \
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
-include $(GENERAL_RULES)/Clang/link-c
+include $(GENERAL_RULES)/AMDClang/link-c
#------------------------------------------------------------------------------
diff --git a/wmake/rules/linux64AMDClang/c++ b/wmake/rules/linux64AMDClang/c++
index 13ddf7f566a..6160e6956e7 100644
--- a/wmake/rules/linux64AMDClang/c++
+++ b/wmake/rules/linux64AMDClang/c++
@@ -1,5 +1,5 @@
#------------------------------------------------------------------------------
-include $(GENERAL_RULES)/Clang/c++
+include $(GENERAL_RULES)/AMDClang/c++
c++ARCH = -m64 -pthread
@@ -17,16 +17,16 @@ cxxtoo = $(Ctoo)
# Linking:
ifneq (,$(findstring +gold,$(WM_COMPILE_CONTROL)))
- include $(GENERAL_RULES)/Clang/link-gold-c++
+ include $(GENERAL_RULES)/AMDClang/link-gold-c++
else ifneq (,$(findstring +mold,$(WM_COMPILE_CONTROL)))
- include $(GENERAL_RULES)/Clang/link-mold-c++
+ include $(GENERAL_RULES)/AMDClang/link-mold-c++
else ifneq (,$(findstring +lld,$(WM_COMPILE_CONTROL)))
- include $(GENERAL_RULES)/Clang/link-lld-c++
+ include $(GENERAL_RULES)/AMDClang/link-lld-c++
else
- include $(GENERAL_RULES)/Clang/link-c++
+ include $(GENERAL_RULES)/AMDClang/link-c++
endif
#------------------------------------------------------------------------------
diff --git a/wmake/rules/linux64AMDClang/general b/wmake/rules/linux64AMDClang/general
index c5a32b88080..29832e27af9 100644
--- a/wmake/rules/linux64AMDClang/general
+++ b/wmake/rules/linux64AMDClang/general
@@ -1,7 +1,7 @@
CPP = cpp -traditional-cpp $(GFLAGS)
include $(GENERAL_RULES)/standard
-include $(GENERAL_RULES)/Clang/openmp
+include $(GENERAL_RULES)/AMDClang/openmp
ifneq (,$(findstring ~openmp,$(WM_COMPILE_CONTROL)))
include $(GENERAL_RULES)/no-openmp
--
GitLab