mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-22 18:43:02 +01:00
Set POSIX build to use C++17.
This commit is contained in:
parent
95cdf42c72
commit
936e045d50
@ -206,14 +206,14 @@ if (MINGW)
|
||||
set(CMAKE_STATIC_LIBRARY_PREFIX)
|
||||
|
||||
add_definitions(-D_WIN32_WINNT=0x0600)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4 -std=c++11")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4 -std=c++17")
|
||||
endif()
|
||||
|
||||
if (UNIX)
|
||||
set(OS_DIR posix)
|
||||
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -msse4 -std=c++11")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -msse4 -std=c++17")
|
||||
|
||||
if (NOT CMAKE_CROSSCOMPILING)
|
||||
set(LIB_readline readline)
|
||||
|
@ -103,7 +103,7 @@ GLOB_OPTIONS:=
|
||||
#____________________________________________________________________________
|
||||
|
||||
# Global c++ flags: firebird needs no RTTI, choose build standard
|
||||
PLUSPLUS_FLAGS:= -fno-rtti -std=c++11
|
||||
PLUSPLUS_FLAGS:= -fno-rtti -std=c++17
|
||||
|
||||
# If this is defined then we use special rules useful for developers only
|
||||
IsDeveloper = @DEVEL_FLG@
|
||||
|
@ -26,4 +26,4 @@ DEV_FLAGS=-ggdb -DFREEBSD -DAMD64 -pipe -MMD -p -fPIC -Wall -Wno-non-virtual-dto
|
||||
# This file must be compiled with SSE4.2 support
|
||||
%/CRC32C.o: CXXFLAGS += -msse4
|
||||
|
||||
CXXFLAGS := $(CXXFLAGS) -std=c++11
|
||||
CXXFLAGS := $(CXXFLAGS) -std=c++17
|
||||
|
@ -906,7 +906,7 @@ dnl if 64-bit mode, then archive tool, ar, needs -X64 option
|
||||
fi
|
||||
|
||||
XE_SAVE_ENV()
|
||||
CXXFLAGS="$CXXFLAGS -std=c++11"
|
||||
CXXFLAGS="$CXXFLAGS -std=c++17"
|
||||
AC_CACHE_CHECK([whether the C++ compiler understands noexcept], [ac_cv_cxx_noexcept], [
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int f(int x) noexcept { return x + 1; }]], [[]])],
|
||||
[ac_cv_cxx_noexcept=yes], [ac_cv_cxx_noexcept=no])])
|
||||
|
@ -61,7 +61,7 @@ KEYGEN_objects=$(INTERMED)/keygen.o
|
||||
TCWRAP_objects=$(INTERMED)/TcWrapper.o
|
||||
KEY_AUTH_objects=$(INTERMED)/ExtAuth.o
|
||||
|
||||
CXXFLAGS=-std=c++11 -pthread -I$(ROOT)/include -fPIC $(TOMCRYPT_COMPILE)
|
||||
CXXFLAGS=-std=c++17 -pthread -I$(ROOT)/include -fPIC $(TOMCRYPT_COMPILE)
|
||||
LDFLAGS=-pthread -L$(LIB) -Wl,-rpath,'$$ORIGIN/../lib' $(TOMCRYPT_LINK)
|
||||
|
||||
LINK_LIBS=-lfbclient -ltomcrypt -ltommath
|
||||
|
@ -33,7 +33,7 @@ FBCLIENT = $(FIREBIRD)/lib/libfbclient.so
|
||||
# General Compiler and linker Defines for Linux
|
||||
# ---------------------------------------------------------------------
|
||||
CXX = c++
|
||||
CXXFLAGS= -c -Wall -g3 -std=c++11 -fno-rtti $(INCLUDE)
|
||||
CXXFLAGS= -c -Wall -g3 -std=c++17 -fno-rtti $(INCLUDE)
|
||||
RM = rm -f
|
||||
|
||||
#
|
||||
|
2
extern/icu/android/aarch64/config.sh
vendored
2
extern/icu/android/aarch64/config.sh
vendored
@ -18,7 +18,7 @@
|
||||
--enable-dyload \
|
||||
--with-cross-build=$CROSS_BUILD_DIR \
|
||||
CFLAGS='-Os' \
|
||||
CXXFLAGS='--std=c++11' \
|
||||
CXXFLAGS='--std=c++17' \
|
||||
LDFLAGS='-static-libstdc++' \
|
||||
CC=aarch64-linux-android24-clang \
|
||||
CXX=aarch64-linux-android24-clang++ \
|
||||
|
2
extern/icu/android/armv7a/config.sh
vendored
2
extern/icu/android/armv7a/config.sh
vendored
@ -18,7 +18,7 @@
|
||||
--enable-dyload \
|
||||
--with-cross-build=$CROSS_BUILD_DIR \
|
||||
CFLAGS='-Os -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \
|
||||
CXXFLAGS='--std=c++11 -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \
|
||||
CXXFLAGS='--std=c++17 -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \
|
||||
LDFLAGS='-static-libstdc++ -march=armv7-a -Wl,--fix-cortex-a8' \
|
||||
CC=arm-linux-androideabi-clang \
|
||||
CXX=arm-linux-androideabi-clang++ \
|
||||
|
2
extern/icu/android/linux/config.sh
vendored
2
extern/icu/android/linux/config.sh
vendored
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
../source/runConfigureICU Linux --prefix=$PWD/prebuilt \
|
||||
CFLAGS="-Os" \
|
||||
CXXFLAGS="--std=c++11" \
|
||||
CXXFLAGS="--std=c++17" \
|
||||
--enable-static \
|
||||
--enable-shared=no \
|
||||
--enable-extras=no \
|
||||
|
Loading…
Reference in New Issue
Block a user