v2.6.0-more-makefile-fixes
Miro Stauder 3 years ago
parent e512fad7f3
commit bb0f4721da

@ -38,7 +38,7 @@ DEBUG := ${ALL_DEBUG}
#export DEBUG
#export EXTRALINK
export MAKE
export CURVER ?= 2.6.0
export CURVER=${CURVER:-2.6.0}
### detect compiler support for c++11/17
CPLUSPLUS := $(shell ${CC} -std=c++17 -dM -E -x c++ /dev/null 2>/dev/null | grep -F __cplusplus | grep -Po '\d\d\d\d\d\dL')
@ -65,7 +65,7 @@ endif
ifeq ($(OS),Darwin)
NPROCS := $(shell sysctl -n hw.ncpu)
endif
export MAKEOPT = -j ${NPROCS}
export MAKEOPT="-j ${NPROCS}"
### systemd
SYSTEMD := 0

@ -117,7 +117,7 @@ STDCPP := -std=c++$(shell echo $(CPLUSPLUS) | cut -c3-4) -DCXX$(shell echo $(CPL
PSQLCH :=
ifeq ($(PROXYSQLCLICKHOUSE),1)
PSQLCH=-DPROXYSQLCLICKHOUSE
PSQLCH := -DPROXYSQLCLICKHOUSE
endif
WGCOV :=
@ -129,7 +129,7 @@ WASAN :=
ifeq ($(WITHASAN),1)
WASAN := -WITHASAN -fsanitize=address
# Force the disable of JEMALLOC, since ASAN isn't compatible.
export NOJEMALLOC = 1
export NOJEMALLOC=1
endif
ifeq ($(TEST_WITHASAN),1)
WASAN += -DTEST_WITHASAN

Loading…
Cancel
Save