From 108b2876654bd5f64dd4a60fe1791cc939921625 Mon Sep 17 00:00:00 2001 From: Urs Janssen Date: Fri, 15 Feb 2013 00:53:33 +0100 Subject: [PATCH] - don't use GCC_MAJOR to see if we're not using gcc as GCC_MAJOR might be set during configure even with --cc=notgcc as long as gcc is installed. --- Makefile | 2 ++ libtcc.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0879247d..59a3ed7c 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,7 @@ VPATH = $(top_srcdir) CPPFLAGS = -I$(TOP) # for config.h +ifeq (-$(findstring clang,$(CC))-,-gcc-) ifeq (-$(findstring $(GCC_MAJOR),01)-,--) CFLAGS+=-fno-strict-aliasing ifeq (-$(findstring $(GCC_MAJOR),23)-,--) @@ -18,6 +19,7 @@ else CFLAGS+=-Wno-unused-result endif endif +endif else # not GCC ifeq (-$(findstring clang,$(CC))-,-clang-) # make clang accept gnuisms in libtcc1.c diff --git a/libtcc.c b/libtcc.c index 3bcc5d52..af0fb7f7 100644 --- a/libtcc.c +++ b/libtcc.c @@ -1643,7 +1643,7 @@ enum { TCC_OPTION_MD, TCC_OPTION_MF, TCC_OPTION_x, - TCC_OPTION_dumpversion + TCC_OPTION_dumpversion, }; #define TCC_OPTION_HAS_ARG 0x0001 -- 2.11.4.GIT