From owner-svn-src-all@freebsd.org Wed Jan 24 20:26:17 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 538A0EC3D94; Wed, 24 Jan 2018 20:26:17 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3F8E576851; Wed, 24 Jan 2018 20:26:14 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 36A922279A; Wed, 24 Jan 2018 20:26:13 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0OKQDhm043223; Wed, 24 Jan 2018 20:26:13 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0OKQCmo043220; Wed, 24 Jan 2018 20:26:12 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201801242026.w0OKQCmo043220@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 24 Jan 2018 20:26:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r328372 - vendor/lldb/dist-release_60/lit X-SVN-Group: vendor X-SVN-Commit-Author: dim X-SVN-Commit-Paths: vendor/lldb/dist-release_60/lit X-SVN-Commit-Revision: 328372 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jan 2018 20:26:17 -0000 Author: dim Date: Wed Jan 24 20:26:12 2018 New Revision: 328372 URL: https://svnweb.freebsd.org/changeset/base/328372 Log: Vendor import of lldb release_60 branch r323338: https://llvm.org/svn/llvm-project/lldb/branches/release_60@323338 Modified: vendor/lldb/dist-release_60/lit/CMakeLists.txt vendor/lldb/dist-release_60/lit/lit.cfg vendor/lldb/dist-release_60/lit/lit.site.cfg.in Modified: vendor/lldb/dist-release_60/lit/CMakeLists.txt ============================================================================== --- vendor/lldb/dist-release_60/lit/CMakeLists.txt Wed Jan 24 20:26:08 2018 (r328371) +++ vendor/lldb/dist-release_60/lit/CMakeLists.txt Wed Jan 24 20:26:12 2018 (r328372) @@ -11,6 +11,10 @@ else() set(ENABLE_SHARED 0) endif(BUILD_SHARED_LIBS) +# the value is not canonicalized within LLVM +llvm_canonicalize_cmake_booleans( + LLVM_ENABLE_ZLIB) + configure_lit_site_cfg( ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg) Modified: vendor/lldb/dist-release_60/lit/lit.cfg ============================================================================== --- vendor/lldb/dist-release_60/lit/lit.cfg Wed Jan 24 20:26:08 2018 (r328371) +++ vendor/lldb/dist-release_60/lit/lit.cfg Wed Jan 24 20:26:12 2018 (r328372) @@ -91,11 +91,11 @@ for pattern in [r"\bFileCheck\b", pattern) tool_pipe = tool_match.group(2) tool_name = tool_match.group(4) - tool_path = lit.util.which(tool_name, config.llvm_tools_dir) + tool_path = lit.util.which(tool_name, config.environment['PATH']) if not tool_path: # Warn, but still provide a substitution. lit_config.note( - 'Did not find ' + tool_name + ' in ' + config.llvm_tools_dir) + 'Did not find ' + tool_name + ' in ' + config.environment['PATH']) config.substitutions.append((pattern, tool_pipe + tool_path)) # Shell execution Modified: vendor/lldb/dist-release_60/lit/lit.site.cfg.in ============================================================================== --- vendor/lldb/dist-release_60/lit/lit.site.cfg.in Wed Jan 24 20:26:08 2018 (r328371) +++ vendor/lldb/dist-release_60/lit/lit.site.cfg.in Wed Jan 24 20:26:12 2018 (r328372) @@ -12,7 +12,7 @@ config.target_triple = "@TARGET_TRIPLE@" config.python_executable = "@PYTHON_EXECUTABLE@" config.cc = "@LLDB_TEST_C_COMPILER@" config.cxx = "@LLDB_TEST_CXX_COMPILER@" -config.have_zlib = @HAVE_LIBZ@ +config.have_zlib = @LLVM_ENABLE_ZLIB@ # Support substitution of the tools and libs dirs with user parameters. This is # used when we can't determine the tool dir at configuration time.