[llvm-branch-commits] [lldb] r368268 - Merging r366513:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Aug  8 01:41:49 2019
New Revision: 368268

URL: http://llvm.org/viewvc/llvm-project?rev=368268&view=rev
Log:
Merging r366513:
------------------------------------------------------------------------
r366513 | lanza | 2019-07-19 01:40:23 +0200 (Fri, 19 Jul 2019) | 9 lines

[cmake] Update NATIVE build variables to account for standalone changes

Summary:
LLDB_PATH_TO_{CLANG,LLVM}_BUILD were removed and replaced with
{LLVM,Clang}_DIR. Adjust the NATIVE build to account for this.

Subscribers: mgorny

Differential Revision: https://reviews.llvm.org/D64959
------------------------------------------------------------------------

Modified:
    lldb/branches/release_90/   (props changed)
    lldb/branches/release_90/CMakeLists.txt

Propchange: lldb/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  8 01:41:49 2019
@@ -1,3 +1,3 @@
 /lldb/branches/apple/python-GIL:156467-162159
 /lldb/branches/iohandler:198360-200250
-/lldb/trunk:366433,366985,367308,367414
+/lldb/trunk:366433,366513,366985,367308,367414

Modified: lldb/branches/release_90/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_90/CMakeLists.txt?rev=368268&r1=368267&r2=368268&view=diff
==============================================================================
--- lldb/branches/release_90/CMakeLists.txt (original)
+++ lldb/branches/release_90/CMakeLists.txt Thu Aug  8 01:41:49 2019
@@ -42,15 +42,14 @@ endif ()
 if(CMAKE_CROSSCOMPILING AND LLDB_BUILT_STANDALONE)
   set(LLVM_USE_HOST_TOOLS ON)
   include(CrossCompile)
-  if (NOT LLDB_PATH_TO_NATIVE_LLVM_BUILD OR
-      NOT LLDB_PATH_TO_NATIVE_CLANG_BUILD)
+  if (NOT NATIVE_LLVM_DIR OR NOT NATIVE_Clang_DIR)
     message(FATAL_ERROR
-      "Crosscompiling standalone requires the variables LLDB_PATH_TO_NATIVE_{CLANG,LLVM}_BUILD
+      "Crosscompiling standalone requires the variables NATIVE_{CLANG,LLVM}_DIR
       for building the native lldb-tblgen used during the build process.")
   endif()
   llvm_create_cross_target(lldb NATIVE "" Release
-    -DLLDB_PATH_TO_LLVM_BUILD=${LLDB_PATH_TO_NATIVE_LLVM_BUILD}
-    -DLLDB_PATH_TO_CLANG_BUILD=${LLDB_PATH_TO_NATIVE_CLANG_BUILD})
+    -DLLVM_DIR=${NATIVE_LLVM_DIR}
+    -DClang_DIR=${NATIVE_Clang_DIR})
 endif()
 
 add_subdirectory(utils/TableGen)