projects / librecmc / librecmc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 98fdf0b)
toolchain/gcc: correct the check expr for newer clang
authorYorkie Liu <yorkiefixer@gmail.com>
Tue, 19 Nov 2019 05:41:10 +0000 (13:41 +0800)
committerRISCi_ATOM <bob@bobcall.me>
Mon, 23 Dec 2019 17:16:05 +0000 (12:16 -0500)
This fixes gcc build error within clang 11.0, it tweaks the version
string from LLVM to clang.

Signed-off-by: Yorkie Liu <yorkiefixer@gmail.com>
(cherry picked from commit 65a561fd0919eafff2363ae8324db64be2a57f77)

toolchain/gcc/common.mk patch | blob | history

diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index 869e84e86f7a36d7c7b8d35cdd36155435115404..5d97025f98c0d0062e393a156a3d9ecb46845eab 100644 (file)
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -85,7 +85,7 @@ endif
 
 GCC_CONFIGURE:= \
        SHELL="$(BASH)" \
-       $(if $(shell gcc --version 2>&1 | grep LLVM), \
+       $(if $(shell gcc --version 2>&1 | grep -E "Apple.(LLVM|clang)"), \
                CFLAGS="-O2 -fbracket-depth=512 -pipe" \
                CXXFLAGS="-O2 -fbracket-depth=512 -pipe" \
        ) \