Putting option -std=gnu++0x in Makefile rather than fbcode.gcc471.sh

Summary: This option is needed for compilation and the open-sourced rocksdb version wiull need to get it from Makefile

Test Plan: make clean;make

Reviewers: MarkCallaghan, dhruba, sheki, chip

CC: leveldb
Differential Revision: https://reviews.facebook.net/D9243

diff --git a/Makefile b/Makefile
index 3f1fe9fcb882b297d0f3bc44a65b1f7f66501d4c..728983ba53740904e4294b9e2adef0ba4aa05332 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ include build_config.mk
 
 WARNING_FLAGS = -Wall -Werror -Wno-unused-parameter -Wno-sign-compare
 CFLAGS += -g $(WARNING_FLAGS) -I. -I./include $(PLATFORM_CCFLAGS) $(OPT)
-CXXFLAGS += -g $(WARNING_FLAGS) -I. -I./include $(PLATFORM_CXXFLAGS) $(OPT)
+CXXFLAGS += -g $(WARNING_FLAGS) -I. -I./include $(PLATFORM_CXXFLAGS) $(OPT) -std=gnu++0x
 
 LDFLAGS += $(PLATFORM_LDFLAGS)
 

diff --git a/fbcode.gcc471.sh b/fbcode.gcc471.sh
index d0a5c4cbe9dc1801f4296e4dd283d4fb24e27068..bf526c4c38f0c8b0ec0e214051611d47b5b657f6 100644 (file)
--- a/fbcode.gcc471.sh
+++ b/fbcode.gcc471.sh
@@ -28,7 +28,7 @@ ZLIB_INCLUDE=" -I $TOOLCHAIN_LIB_BASE/zlib/zlib-1.2.5/91ddd43/include"
 ZLIB_LIBS=" $TOOLCHAIN_LIB_BASE/zlib/zlib-1.2.5/91ddd43/lib/libz.a"
 
 # location of boost headers and libraries
-THRIFT_INCLUDE=" -I $TOOLCHAIN_LIB_BASE/boost/boost-1.48.0/2a0840d/include -std=gnu++0x"
+THRIFT_INCLUDE=" -I $TOOLCHAIN_LIB_BASE/boost/boost-1.48.0/2a0840d/include"
 THRIFT_INCLUDE+=" -I./thrift -I./thrift/gen-cpp -I./thrift/lib/cpp"
 THRIFT_LIBS=" -L $TOOLCHAIN_LIB_BASE/boost/boost-1.48.0/2a0840d/lib"