From: Adrian Prantl <aprantl@apple.com>
Date: Thu, 30 Jun 2016 15:58:36 +0000 (+0000)
Subject: Revert "[CMake] Move the -Xclang option before -fmodules-cache-path"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39952bd72b0964de3b1d53bcaec53516244b2872;p=llvm

Revert "[CMake] Move the -Xclang option before -fmodules-cache-path"

This reverts commit 3db82f646a0890eb7664d0351b5a3c79622e8bef.

Vassil already fixed this and I mechanically undid his fix without looking
too close at what I'm actually doing. Need more coffee.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@274242 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
index d4587913522..675bba6ab36 100644
--- a/cmake/modules/HandleLLVMOptions.cmake
+++ b/cmake/modules/HandleLLVMOptions.cmake
@@ -465,13 +465,13 @@ elseif( LLVM_COMPILER_IS_GCC_COMPATIBLE )
   endif()
   if (LLVM_ENABLE_MODULES)
     set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-    set(module_flags "-fmodules -Xclang -fmodules-cache-path=module.cache")
+    set(module_flags "-fmodules -fmodules-cache-path=module.cache")
     if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
       # On Darwin -fmodules does not imply -fcxx-modules.
       set(module_flags "${module_flags} -fcxx-modules")
     endif()
     if (LLVM_ENABLE_LOCAL_SUBMODULE_VISIBILITY)
-      set(module_flags "${module_flags} -fmodules-local-submodule-visibility")
+      set(module_flags "${module_flags} -Xclang -fmodules-local-submodule-visibility")
     endif()
     set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${module_flags}")