Kaydet (Commit) 9fed8a5e authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Do not silently ignore --enable-libc++

Change-Id: Ifbabb338739ae452bee6cac73e4b2046356a4d17
üst 0c7e4656
...@@ -2670,6 +2670,9 @@ if test $_os = Darwin; then ...@@ -2670,6 +2670,9 @@ if test $_os = Darwin; then
AC_MSG_CHECKING([what compiler to use]) AC_MSG_CHECKING([what compiler to use])
case $with_macosx_sdk in case $with_macosx_sdk in
10.6) 10.6)
if test "$enable_libc__" = yes; then
AC_MSG_ERROR([--enable-libc++ requires --with-macosx-version-min-required >= 10.7])
fi
# did someone copy her 10.6 sdk into xcode 4 (needed on Mountain Lion)? # did someone copy her 10.6 sdk into xcode 4 (needed on Mountain Lion)?
if test "$(echo $MACOSX_SDK_PATH | cut -c1-23)" = "/Applications/Xcode.app"; then if test "$(echo $MACOSX_SDK_PATH | cut -c1-23)" = "/Applications/Xcode.app"; then
CC="`xcrun -find gcc` $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH" CC="`xcrun -find gcc` $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
...@@ -2682,7 +2685,10 @@ if test $_os = Darwin; then ...@@ -2682,7 +2685,10 @@ if test $_os = Darwin; then
LIBTOOL=libtool LIBTOOL=libtool
;; ;;
10.7|10.8|10.9) 10.7|10.8|10.9)
if test "$enable_libc__" = yes -a "$with_macosx_version_min_required" != 10.6; then if test "$enable_libc__" = yes; then
if test "$with_macosx_version_min_required" = 10.6; then
AC_MSG_ERROR([--enable-libc++ requires --with-macosx-version-min-required >= 10.7])
fi
# Use libc++ instead of libstdc++ when possible # Use libc++ instead of libstdc++ when possible
# and also compile as C++11 # and also compile as C++11
stdlib="-std=c++11 -stdlib=libc++" stdlib="-std=c++11 -stdlib=libc++"
......
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