[libcxx-commits] [libcxx] r352497 - Merging r352374:

Hans Wennborg via libcxx-commits libcxx-commits at lists.llvm.org
Tue Jan 29 06:23:48 PST 2019


Author: hans
Date: Tue Jan 29 06:23:48 2019
New Revision: 352497

URL: http://llvm.org/viewvc/llvm-project?rev=352497&view=rev
Log:
Merging r352374:
------------------------------------------------------------------------
r352374 | mgorny | 2019-01-28 16:16:03 +0100 (Mon, 28 Jan 2019) | 18 lines

[cmake] Fix get_llvm_lit_path() to respect LLVM_EXTERNAL_LIT always

Refactor the get_llvm_lit_path() logic to respect LLVM_EXTERNAL_LIT,
and require the fallback to be defined explicitly
as LLVM_DEFAULT_EXTERNAL_LIT. This fixes building libcxx standalone
after r346888.

The old logic was using LLVM_EXTERNAL_LIT both as user-defined cache
variable and an optional pre-definition of default value from caller
(e.g. libcxx). It included a hack to make this work by assigning
the value back and forth but it was fragile and stopped working
in libcxx.

The new logic is simpler and more transparent. Default value is
provided in a separate variable, and used only when user-specified
variable is empty (i.e. not overriden).

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

Modified:
    libcxx/branches/release_80/   (props changed)
    libcxx/branches/release_80/cmake/Modules/HandleOutOfTreeLLVM.cmake

Propchange: libcxx/branches/release_80/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 29 06:23:48 2019
@@ -1,2 +1,2 @@
 /libcxx/branches/apple:136569-137939
-/libcxx/trunk:351670
+/libcxx/trunk:351670,352374

Modified: libcxx/branches/release_80/cmake/Modules/HandleOutOfTreeLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_80/cmake/Modules/HandleOutOfTreeLLVM.cmake?rev=352497&r1=352496&r2=352497&view=diff
==============================================================================
--- libcxx/branches/release_80/cmake/Modules/HandleOutOfTreeLLVM.cmake (original)
+++ libcxx/branches/release_80/cmake/Modules/HandleOutOfTreeLLVM.cmake Tue Jan 29 06:23:48 2019
@@ -116,7 +116,7 @@ macro(configure_out_of_tree_llvm)
     # Required LIT Configuration ------------------------------------------------
     # Define the default arguments to use with 'lit', and an option for the user
     # to override.
-    set(LLVM_EXTERNAL_LIT "${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py")
+    set(LLVM_DEFAULT_EXTERNAL_LIT "${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py")
     set(LIT_ARGS_DEFAULT "-sv --show-xfail --show-unsupported")
     if (MSVC OR XCODE)
       set(LIT_ARGS_DEFAULT "${LIT_ARGS_DEFAULT} --no-progress-bar")




More information about the libcxx-commits mailing list