[PATCH] D48108: Handle an Xcode path with spaces in it

[Jordan Rose via Phabricator via llvm-commits]

jordan_rose created this revision.
jordan_rose added reviewers: kubamracek, steven_wu.
Herald added subscribers: kristof.beyls, mgorny.
Herald added a reviewer: javed.absar.

These two changes make it possible to build on macOS where the path to Xcode includes spaces. I don't expect people to not break this, but there seems to be no harm in taking it.


Repository:
  rL LLVM

https://reviews.llvm.org/D48108

Files:
  CMakeLists.txt
  cmake/platforms/iOS.cmake


Index: cmake/platforms/iOS.cmake
===================================================================
--- cmake/platforms/iOS.cmake
+++ cmake/platforms/iOS.cmake
@@ -88,7 +88,7 @@
    OUTPUT_STRIP_TRAILING_WHITESPACE)
 ENDIF()
 
-SET(IOS_COMMON_FLAGS "-isysroot ${SDKROOT} -m${PLATFORM_FLAG_NAME}-version-min=${IOS_MIN_TARGET}")
+SET(IOS_COMMON_FLAGS "-isysroot \"${SDKROOT}\" -m${PLATFORM_FLAG_NAME}-version-min=${IOS_MIN_TARGET}")
 SET(CMAKE_C_FLAGS "${IOS_COMMON_FLAGS}" CACHE STRING "toolchain_cflags" FORCE)
 SET(CMAKE_CXX_FLAGS "${IOS_COMMON_FLAGS}" CACHE STRING "toolchain_cxxflags" FORCE)
 SET(CMAKE_LINK_FLAGS "${IOS_COMMON_FLAGS}" CACHE STRING "toolchain_linkflags" FORCE)
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -87,7 +87,7 @@
 
     foreach(lang ${languages})
       set(CMAKE_${lang}_CREATE_STATIC_LIBRARY
-        "${CMAKE_LIBTOOL} -static ${LIBTOOL_NO_WARNING_FLAG} -o <TARGET> \
+        "\"${CMAKE_LIBTOOL}\" -static ${LIBTOOL_NO_WARNING_FLAG} -o <TARGET> \
         <LINK_FLAGS> <OBJECTS> ")
     endforeach()
   endif()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D48108.151070.patch
Type: text/x-patch
Size: 1129 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180612/20c2d639/attachment.bin>