Commit 85a2898c authored by Dominik Charousset's avatar Dominik Charousset

Add `--no-auto-libc++` configure option

parent afdcaf79
...@@ -142,7 +142,7 @@ if(MORE_WARNINGS) ...@@ -142,7 +142,7 @@ if(MORE_WARNINGS)
set(EXTRA_FLAGS "${EXTRA_FLAGS} ${WFLAGS_STR}") set(EXTRA_FLAGS "${EXTRA_FLAGS} ${WFLAGS_STR}")
endif() endif()
# add -stdlib=libc++ when using Clang # add -stdlib=libc++ when using Clang
if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") if(NOT NO_AUTO_LIBCPP AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
message(STATUS "NOTE: Automatically added -stdlib=libc++ flag, " message(STATUS "NOTE: Automatically added -stdlib=libc++ flag, "
"you can override this by defining CMAKE_CXX_FLAGS " "you can override this by defining CMAKE_CXX_FLAGS "
"(see 'configure --help')") "(see 'configure --help')")
......
...@@ -47,14 +47,12 @@ Usage: $0 [OPTION]... [VAR=VALUE]... ...@@ -47,14 +47,12 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
--build-static-only build as static library only --build-static-only build as static library only
--more-warnings enables most warnings --more-warnings enables most warnings
--no-compiler-check disable compiler version check --no-compiler-check disable compiler version check
--no-auto-libc++ do not automatically enable libc++ for Clang
--warnings-as-errors enables -Werror --warnings-as-errors enables -Werror
Installation Directories: Installation Directories:
--prefix=PREFIX installation directory [/usr/local] --prefix=PREFIX installation directory [/usr/local]
Add Optional Features:
--enable-perftools build with Google perftools
Remove Standard Features (even if all dependencies are available): Remove Standard Features (even if all dependencies are available):
--no-memory-management build without memory management --no-memory-management build without memory management
--no-examples build without examples --no-examples build without examples
...@@ -238,6 +236,9 @@ while [ $# -ne 0 ]; do ...@@ -238,6 +236,9 @@ while [ $# -ne 0 ]; do
--no-compiler-check) --no-compiler-check)
append_cache_entry NO_COMPILER_CHECK BOOL yes append_cache_entry NO_COMPILER_CHECK BOOL yes
;; ;;
--no-auto-libc++)
append_cache_entry NO_AUTO_LIBCPP BOOL yes
;;
--warnings-as-errors) --warnings-as-errors)
append_cache_entry CXX_WARNINGS_AS_ERROS BOOL yes append_cache_entry CXX_WARNINGS_AS_ERROS BOOL yes
;; ;;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment