diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -16,7 +16,7 @@ help() { Usage: \$ $0 [--enable-*|--disable-*] [--with-*|--without-*] [CC=...] [...] - \$ $MAKE -j$(nproc) + \$ $MAKE -j$(_nproc) Variables set in the environment or on the command line will be picked up: @@ -40,7 +40,7 @@ The default flags result in a plain debug build. Other build profiles include: --enable-release Enable optimizations, disable assertions - --enable-{asan,lsan,msan,tsan,ubsan} + --enable-{asan,lsan,msan,tsan,tysan,ubsan} Enable sanitizers --enable-gcov Enable code coverage instrumentation @@ -66,7 +66,7 @@ Packaging: This script is a thin wrapper around a makefile-based configuration system. Any other arguments will be passed directly to the $MAKE invocation, e.g. - \$ $0 -j$(nproc) V=1 + \$ $0 -j$(_nproc) V=1 EOF } @@ -85,9 +85,9 @@ invalid() { } # Get the number of cores to use -nproc() { +_nproc() { { - command nproc \ + nproc \ || sysctl -n hw.ncpu \ || getconf _NPROCESSORS_ONLN \ || echo 1 @@ -164,7 +164,7 @@ for arg; do --enable-*|--disable-*) case "$name" in - release|lto|asan|lsan|msan|tsan|ubsan|lint|gcov) + release|lto|asan|lsan|msan|tsan|tysan|ubsan|lint|gcov) set -- "$@" "$NAME=$yn" ;; *) @@ -197,7 +197,7 @@ for arg; do ;; # Warn about MAKE variables that have documented configure flags - RELEASE=*|LTO=*|ASAN=*|LSAN=*|MSAN=*|TSAN=*|UBSAN=*|LINT=*|GCOV=*) + RELEASE=*|LTO=*|ASAN=*|LSAN=*|MSAN=*|TSAN=*|TYSAN=*|UBSAN=*|LINT=*|GCOV=*) name=$(printf '%s' "$NAME" | tr 'A-Z_' 'a-z-') warn '"%s" is deprecated; use --enable-%s' "$arg" "$name" set -- "$@" "$arg" @@ -227,11 +227,11 @@ for arg; do done # Set up symbolic links for out-of-tree builds -for f in Makefile build completions docs src tests; do +for f in Makefile bench build completions docs src tests; do test -e "$f" || ln -s "$DIR/$f" "$f" done -# Set MAKEFLAGS to -j$(nproc) if it's unset -export MAKEFLAGS="${MAKEFLAGS--j$(nproc)}" +# Set MAKEFLAGS to -j$(_nproc) if it's unset +export MAKEFLAGS="${MAKEFLAGS--j$(_nproc)}" $MAKE -rf build/config.mk "$@" |