[llvm-commits] [lld] r172897 - /lld/trunk/CMakeLists.txt

[Chandler Carruth]

Author: chandlerc
Date: Sat Jan 19 03:41:42 2013
New Revision: 172897

URL: http://llvm.org/viewvc/llvm-project?rev=172897&view=rev
Log:
Allow the LLD CMake build to work with -std=gnu++0x and -std=gnu++11 as
well as c++0x and c++11. This can be especially useful when building
with GCC in C++11 mode.

Modified:
    lld/trunk/CMakeLists.txt

Modified: lld/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/CMakeLists.txt?rev=172897&r1=172896&r2=172897&view=diff
==============================================================================
--- lld/trunk/CMakeLists.txt (original)
+++ lld/trunk/CMakeLists.txt Sat Jan 19 03:41:42 2013
@@ -77,7 +77,9 @@
   if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR
       "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
     if (NOT ("${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+0x" OR
-             "${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+11"))
+             "${CMAKE_CXX_FLAGS}" MATCHES "-std=gnu\\+\\+0x" OR
+             "${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+11" OR
+             "${CMAKE_CXX_FLAGS}" MATCHES "-std=gnu\\+\\+11"))
       message(FATAL_ERROR
         "lld requires c++11. Clang and gcc require -std=c++0x or -std=c++11 to "
         "enter this mode. Please set CMAKE_CXX_FLAGS accordingly.")