From 0b22938bceba692d31e6f38e0dbb0c620762f809 Mon Sep 17 00:00:00 2001
From: Frank LENORMAND <lenormf@gmail.com>
Date: Sat, 14 Jan 2017 11:53:53 +0300
Subject: [PATCH] Remove the option that excludes the `-pedantic` flag from
 `CXXFLAGS`

Allowing compilation without the `-pedantic` flag was a temporary trick
to work around a bug involving `libstdc++` and `musl`. A fix has been
pushed for the issue in the appropriate repositories, we no longer need
the optional non-pedantic compilation option.
---
 contrib/Tupfile | 7 +------
 src/Makefile    | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/contrib/Tupfile b/contrib/Tupfile
index 29b620d7..c8c97d4e 100644
--- a/contrib/Tupfile
+++ b/contrib/Tupfile
@@ -12,12 +12,11 @@
 
 debug    = yes
 static   = no
-pedantic = yes
 
 suffix   = .opt
 
 CXX      = g++
-CXXFLAGS = -std=gnu++11 -Wall -Wno-reorder -Wno-sign-compare -Wno-address
+CXXFLAGS = -pedantic -std=gnu++11 -Wall -Wno-reorder -Wno-sign-compare -Wno-address
 CPPFLAGS =
 LDFLAGS  =
 LIBS     =
@@ -35,10 +34,6 @@ ifeq ($(static),yes)
 	LDFLAGS += -static -pthread
 endif
 
-ifeq ($(pedantic),yes)
-	CXXFLAGS += -pedantic
-endif
-
 ifeq (@(TUP_PLATFORM),macosx)
 	LIBS += -lncurses -lboost_regex-mt
 	CPPFLAGS += -I/usr/local/opt/ncurses/include
diff --git a/src/Makefile b/src/Makefile
index 4f9be7ba..b2186394 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,5 @@
 debug ?= yes
 static ?= no
-pedantic ?= yes
 
 ifeq ($(debug),yes)
     CPPFLAGS += -DKAK_DEBUG
@@ -14,10 +13,6 @@ else
     endif
 endif
 
-ifeq ($(pedantic),yes)
-    CXXFLAGS += -pedantic
-endif
-
 sources := $(wildcard *.cc)
 objects := $(addprefix ., $(sources:.cc=$(suffix).o))
 deps := $(addprefix ., $(sources:.cc=$(suffix).d))
@@ -64,7 +59,7 @@ ifeq ($(static),yes)
     LDFLAGS += -static -pthread
 endif
 
-CXXFLAGS += -std=gnu++11 -g -Wall -Wno-reorder -Wno-sign-compare -Wno-address
+CXXFLAGS += -pedantic -std=gnu++11 -g -Wall -Wno-reorder -Wno-sign-compare -Wno-address
 
 all : kak
 kak : $(objects)