From d4d1768575a7df888bcab80c86d86b4ca9c499c2 Mon Sep 17 00:00:00 2001 From: hagen Date: Fri, 27 Nov 2015 11:42:44 +0000 Subject: [PATCH] * Makefile.* : fix build with gcc 4.7.2 (#299) --- Makefile.bsd | 2 +- Makefile.linux | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.bsd b/Makefile.bsd index 72820069..08994a24 100644 --- a/Makefile.bsd +++ b/Makefile.bsd @@ -6,7 +6,7 @@ CXXFLAGS = -O2 ## (e.g. -fstack-protector-strong -Wformat -Werror=format-security), we do not want to remove ## -std=c++11. If you want to remove this variable please do so in a way that allows setting ## custom FLAGS to work at build-time. -NEEDED_CXXFLAGS = -std=c++11 +NEEDED_CXXFLAGS = -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1 INCFLAGS = -I/usr/include/ -I/usr/local/include/ LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib LDLIBS = -lcrypto -lssl -lz -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread diff --git a/Makefile.linux b/Makefile.linux index 78dcaaf0..724be15d 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -15,7 +15,7 @@ ifeq ($(shell expr match $(CXX) 'clang'),5) else ifeq ($(shell expr match ${CXXVER} "4\.[0-9][0-9]"),4) # gcc >= 4.10 NEEDED_CXXFLAGS += -std=c++11 else ifeq ($(shell expr match ${CXXVER} "4\.[7-9]"),3) # >= 4.7 - NEEDED_CXXFLAGS += -std=c++11 + NEEDED_CXXFLAGS += -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1 else ifeq ($(shell expr match ${CXXVER} "4\.6"),3) # = 4.6 NEEDED_CXXFLAGS += -std=c++0x else ifeq ($(shell expr match ${CXXVER} "5\.[0-9]"),3) # gcc >= 5.0