File tree Expand file tree Collapse file tree 11 files changed +9
-8
lines changed Expand file tree Collapse file tree 11 files changed +9
-8
lines changed Original file line number Diff line number Diff line change 46
46
FALLBACK_DOWNLOAD_PATH ?= https://bitcoincore.org/depends-sources
47
47
48
48
C_STANDARD ?= c11
49
+ CXX_STANDARD ?= c++17
49
50
50
51
BUILD = $(shell ./config.guess)
51
52
HOST ?= $(BUILD )
Original file line number Diff line number Diff line change @@ -97,6 +97,7 @@ The following can be set when running make: `make FOO=bar`
97
97
- ` SDK_PATH ` : Path where SDKs can be found (used by macOS)
98
98
- ` FALLBACK_DOWNLOAD_PATH ` : If a source file can't be fetched, try here before giving up
99
99
- ` C_STANDARD ` : Set the C standard version used. Defaults to ` c11 ` .
100
+ - ` CXX_STANDARD ` : Set the C++ standard version used. Defaults to ` c++17 ` .
100
101
- ` NO_QT ` : Don't download/build/cache Qt and its dependencies
101
102
- ` NO_QR ` : Don't download/build/cache packages needed for enabling qrencode
102
103
- ` NO_ZMQ ` : Don't download/build/cache packages needed for enabling ZeroMQ
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ android_CC=$(ANDROID_TOOLCHAIN_BIN)/$(HOST)$(ANDROID_API_LEVEL)-clang
7
7
endif
8
8
9
9
android_CFLAGS=-std =$(C_STANDARD )
10
+ android_CXXFLAGS=-std =$(CXX_STANDARD )
10
11
11
12
ifneq ($(LTO ) ,)
12
13
android_CFLAGS += -flto
Original file line number Diff line number Diff line change @@ -110,7 +110,7 @@ darwin_CXX=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
110
110
-Xclang -internal-externc-isystem$(OSX_SDK ) /usr/include
111
111
112
112
darwin_CFLAGS =-pipe -std=$(C_STANDARD )
113
- darwin_CXXFLAGS =-pipe
113
+ darwin_CXXFLAGS =-pipe -std= $( CXX_STANDARD )
114
114
115
115
ifneq ($(LTO ) ,)
116
116
darwin_CFLAGS += -flto
Original file line number Diff line number Diff line change 1
1
freebsd_CFLAGS =-pipe -std=$(C_STANDARD )
2
- freebsd_CXXFLAGS =-pipe
2
+ freebsd_CXXFLAGS =-pipe -std= $( CXX_STANDARD )
3
3
4
4
ifneq ($(LTO ) ,)
5
5
freebsd_CFLAGS += -flto
Original file line number Diff line number Diff line change 1
1
linux_CFLAGS =-pipe -std=$(C_STANDARD )
2
- linux_CXXFLAGS =-pipe
2
+ linux_CXXFLAGS =-pipe -std= $( CXX_STANDARD )
3
3
4
4
ifneq ($(LTO ) ,)
5
5
linux_CFLAGS += -flto
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ mingw32_CXX := $(host)-g++-posix
3
3
endif
4
4
5
5
mingw32_CFLAGS =-pipe -std=$(C_STANDARD )
6
- mingw32_CXXFLAGS =-pipe
6
+ mingw32_CXXFLAGS =-pipe -std= $( CXX_STANDARD )
7
7
8
8
ifneq ($(LTO ) ,)
9
9
mingw32_CFLAGS += -flto
Original file line number Diff line number Diff line change 1
1
netbsd_CFLAGS =-pipe -std=$(C_STANDARD )
2
- netbsd_CXXFLAGS =-pipe
2
+ netbsd_CXXFLAGS =-pipe -std= $( CXX_STANDARD )
3
3
4
4
ifneq ($(LTO ) ,)
5
5
netbsd_CFLAGS += -flto
Original file line number Diff line number Diff line change 1
1
openbsd_CFLAGS =-pipe -std=$(C_STANDARD )
2
- openbsd_CXXFLAGS =-pipe
2
+ openbsd_CXXFLAGS =-pipe -std= $( CXX_STANDARD )
3
3
4
4
ifneq ($(LTO ) ,)
5
5
openbsd_CFLAGS += -flto
Original file line number Diff line number Diff line change @@ -15,7 +15,6 @@ $(package)_config_opts_netbsd=--with-pic
15
15
$(package ) _config_opts_openbsd=--with-pic
16
16
$(package ) _config_opts_android=--with-pic
17
17
$(package ) _cflags+=-Wno-error=implicit-function-declaration
18
- $(package ) _cxxflags+=-std=c++17
19
18
$(package ) _cppflags_mingw32=-DUNICODE -D_UNICODE
20
19
endef
21
20
You can’t perform that action at this time.
0 commit comments