From 8e7328da22282b8b5ab9e9a0529f49c8472da3e7 Mon Sep 17 00:00:00 2001 From: Davin McCall Date: Thu, 19 Nov 2015 22:45:29 +0000 Subject: [PATCH] Move compiler flags out of the Makefile and into mconfig --- Makefile | 2 +- mconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 10d789b..a0cd8d3 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ dinit-start: dinit-start.o $(CXX) -o dinit-start dinit-start.o $(EXTRA_LIBS) $(objects): %.o: %.cc service.h dinit-log.h control.h control-cmds.h - $(CXX) -D_GLIBCXX_USE_CXX11_ABI=0 -std=gnu++11 -c -Os -Wall $< -o $@ + $(CXX) $(CXXOPTS) -c $< -o $@ #install: all diff --git a/mconfig b/mconfig index 5ecb9aa..780aace 100644 --- a/mconfig +++ b/mconfig @@ -1,14 +1,14 @@ # LLVM/clang++ with libc++ on Linux #CXX=clang++ -#CXXOPTS=-stdlib=libc++ +#CXXOPTS=-stdlib=libc++ -std=gnu++11 -Os -Wall #EXTRA_LIBS=-lc++abi # GCC. Note with GCC 5,5.1,5.2 the new C++11 ABI is buggy. CXX=g++ -CXXOPTS=-D_GLIBCXX_USE_CXX11_ABI=0 +CXXOPTS=-D_GLIBCXX_USE_CXX11_ABI=0 -std=gnu++11 -Os -Wall EXTRA_LIBS= # OpenBSD, tested with GCC 4.9.3 and gmake: #CXX=eg++ -#CXXOPTS= +#CXXOPTS=-D_GLIBCXX_USE_CXX11_ABI=0 -std=gnu++11 -Os -Wall #EXTRA_LIBS= -- 2.25.1