From 34af67c913a99655e61fdee4e6419b49387ff59a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Sun, 31 Dec 2023 05:54:24 -0500
Subject: [PATCH] If we're using Clang as the compiler, use it as the assembler
too.
Should fix issue reported by Floffy on IRC.
---
src/build/Common.gmake | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/build/Common.gmake b/src/build/Common.gmake
index 475fdec384..33db36b3cc 100644
--- a/src/build/Common.gmake
+++ b/src/build/Common.gmake
@@ -169,10 +169,12 @@ CC ?= gcc
CCPRE ?= ${shell if [ `echo __clang__ | $(CC) -E - | grep -v '^\#'` != __clang__ ] ; then echo clang ; elif [ `echo __INTEL_COMPILER | $(CC) -E - | grep -v '^\#'` != __INTEL_COMPILER ] ; then echo icc ; else echo gcc ; fi}
ifeq ($(CCPRE),clang)
ifeq ($(CC),cc)
- CXX := c++
+ CXX := c++
+ AS := cc
else
ifeq ($(CC),clang)
- CXX := clang++
+ CXX := clang++
+ AS := clang
endif
endif
endif
--
GitLab