Skip to content

Commit ad92595

Browse files
committed
build: Don't error out if clang is too old. Instead, build with GCC.
1 parent 684df97 commit ad92595

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

configure

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,17 @@ then
287287
case $CFG_CLANG_VERSION in
288288
(3.0svn | 3.0)
289289
step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
290+
CFG_C_COMPILER="clang"
290291
;;
291292
(*)
292-
err "bad CLANG version: $CFG_CLANG_VERSION, need >=3.0svn"
293+
msg "bad CLANG version: $CFG_CLANG_VERSION, need >=3.0svn; disabling"
294+
CFG_C_COMPILER="gcc"
293295
;;
294296
esac
297+
else
298+
CFG_C_COMPILER="gcc"
295299
fi
300+
putvar CFG_C_COMPILER
296301

297302
putvar CFG_LLVM_ROOT
298303
putvar CFG_LLVM_INCDIR

mk/platform.mk

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ ifdef CFG_WINDOWSY
135135
endif
136136

137137

138-
ifdef CFG_CLANG
139-
CFG_INFO := $(info cfg: using clang)
138+
CFG_INFO := $(info cfg: using $(CFG_C_COMPILER))
139+
ifeq ($(CFG_C_COMPILER),clang)
140140
CFG_GCCISH_CFLAGS += -Wall -Werror -fno-rtti -fno-exceptions -g
141141
CFG_GCCISH_LINK_FLAGS += -g
142142
CFG_COMPILE_C = $(CFG_GCCISH_CROSS)clang++ $(CFG_GCCISH_CFLAGS) \
@@ -146,8 +146,7 @@ ifdef CFG_CLANG
146146
CFG_LINK_C = $(CFG_GCCISH_CROSS)clang++ $(CFG_GCCISH_LINK_FLAGS) -o $(1) \
147147
$(CFG_GCCISH_DEF_FLAG)$(3) $(2)
148148
else
149-
ifdef CFG_GCC
150-
CFG_INFO := $(info cfg: using gcc)
149+
ifeq ($(CFG_C_COMPILER),gcc)
151150
CFG_GCCISH_CFLAGS += -Wall -Werror -fno-rtti -fno-exceptions -g
152151
CFG_GCCISH_LINK_FLAGS += -g
153152
CFG_COMPILE_C = $(CFG_GCCISH_CROSS)g++ $(CFG_GCCISH_CFLAGS) \

0 commit comments

Comments
 (0)