Rebased localmods in libcxx to 223109.

CMakeLists.txt

 # See www/CMake.html for instructions on how to build libcxx with CMake.
 
 #===============================================================================
 # Setup Project
 #===============================================================================
 
 project(libcxx CXX C)
 cmake_minimum_required(VERSION 2.8)
 
 set(PACKAGE_NAME libcxx)
@@ skipping 77 matching lines @@
 # Declare libc++ configuration variables.
 # They are intended for use as follows:
 # LIBCXX_CXX_FLAGS: General flags for both the compiler and linker.
 # LIBCXX_COMPILE_FLAGS: Compile only flags.
 # LIBCXX_LINK_FLAGS: Linker only flags.
 set(LIBCXX_CXX_FLAGS "")
 set(LIBCXX_COMPILE_FLAGS "")
 set(LIBCXX_LINK_FLAGS "")
 
 # Configure compiler.
-include(config-ix)
+# @LOCALMOD-START Use a custom compiler config because cmake try_compile always
+# tries to link an executable and linking doesnt work during bootstrap without
+# libnacl.
+if (CMAKE_SYSTEM_NAME STREQUAL "nacl")
+  include(config-ix-pnacl)
+else()
+  include(config-ix)
+endif()
+# @LOCALMOD-END
 # Configure ABI library
 include(HandleLibCXXABI)
 
 #===============================================================================
 # Setup Compiler Flags
 #===============================================================================
 
 # Get required flags.
 # On all systems the system c++ standard library headers need to be excluded.
 if (MSVC)
@@ skipping 124 matching lines @@
       list(APPEND LIBCXX_CXX_FLAGS "-fsanitize=thread")
     else()
       message(WARNING "Unsupported value of LLVM_USE_SANITIZER: ${LLVM_USE_SANITIZER}")
     endif()
   elseif(MSVC)
     message(WARNING "LLVM_USE_SANITIZER is not supported with MSVC")
   endif()
 endif()
 
 string(REPLACE ";" " " LIBCXX_CXX_FLAGS "${LIBCXX_CXX_FLAGS}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBCXX_CXX_FLAGS}")
+# @LOCALMOD reverse the order, so that we can override -std=...
+set(CMAKE_CXX_FLAGS "${LIBCXX_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
 
 #===============================================================================
 # Setup Source Code
 #===============================================================================
 
 include_directories(include)
 add_subdirectory(include)
 
 # Add source code. This also contains all of the logic for deciding linker flags
 # soname, etc...
 add_subdirectory(lib)
 
 #===============================================================================
 # Setup Tests
 #===============================================================================
 
 add_subdirectory(test)