From f196c1bad8928b502c0ad1abd86c35ab53d3468e Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Tue, 17 Dec 2013 10:14:15 +0100 Subject: [PATCH] Further simplify Makefile No functional change. --- src/Makefile | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/src/Makefile b/src/Makefile index 291775a9..04418cdc 100644 --- a/src/Makefile +++ b/src/Makefile @@ -170,28 +170,37 @@ endif ### ========================================================================== ### 3.1 Selecting compiler (default = gcc) + +CXXFLAGS += -Wall -Wcast-qual -fno-exceptions -fno-rtti $(EXTRACXXFLAGS) +LDFLAGS += $(EXTRALDFLAGS) + ifeq ($(COMP),) COMP=gcc endif -ifeq ($(COMP),mingw) - comp=mingw +ifeq ($(COMP),gcc) + comp=gcc CXX=g++ + CXXFLAGS += -ansi -pedantic -Wno-long-long -Wextra -Wshadow endif -ifeq ($(COMP),gcc) - comp=gcc +ifeq ($(COMP),mingw) + comp=mingw CXX=g++ + CXXFLAGS += -Wextra -Wshadow + LDFLAGS += -static-libstdc++ -static-libgcc endif ifeq ($(COMP),icc) comp=icc CXX=icpc + CXXFLAGS += -diag-disable 1476,10120 -Wcheck -Wabi -Wdeprecated -strict-ansi endif ifeq ($(COMP),clang) comp=clang CXX=clang++ + CXXFLAGS += -ansi -pedantic -Wno-long-long -Wextra -Wshadow endif ifeq ($(comp),icc) @@ -206,27 +215,6 @@ else profile_clean = gcc-profile-clean endif -### 3.2 General compiler and linker settings -CXXFLAGS = -Wall -Wcast-qual -fno-exceptions -fno-rtti $(EXTRACXXFLAGS) -LDFLAGS += $(EXTRALDFLAGS) - -ifeq ($(comp),gcc) - CXXFLAGS += -ansi -pedantic -Wno-long-long -Wextra -Wshadow -endif - -ifeq ($(comp),mingw) - CXXFLAGS += -Wextra -Wshadow - LDFLAGS += -static-libstdc++ -static-libgcc -endif - -ifeq ($(comp),icc) - CXXFLAGS += -diag-disable 1476,10120 -Wcheck -Wabi -Wdeprecated -strict-ansi -endif - -ifeq ($(comp),clang) - CXXFLAGS += -ansi -pedantic -Wno-long-long -Wextra -Wshadow -endif - ifeq ($(os),osx) CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.6 LDFLAGS += -arch $(arch) -mmacosx-version-min=10.6 -- 2.39.2