Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(618)

Issue 615083006: Fix clang tooling build on Linux (shim CMake in LLVM tree). (Closed)

Created:
6 years, 2 months ago by dcheng
Modified:
6 years, 2 months ago
Reviewers:
hans
CC:
chromium-reviews, dmikurube+clang_chromium.org, eugenis+clang_chromium.org, glider+clang_chromium.org, ukai+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Project:
chromium
Visibility:
Public.

Description

Fix Clang tooling build on Linux. Since the chrome clang tools are built outside the LLVM tree, direct references to LLVM/Clang libraries don't work as expected on Linux. This patch changes the Clang update script to create a shim directory for triggering the Chrome tools build as part of the LLVM build. The shim CMakeLists.txt just forwards to the real one in tools/clang. As a bonus, this allows the CMake files in tools/clang to just use CMAKE_SOURCE_DIR/CMAKE_BINARY_DIR instead of having to manually specify the LLVM source/binary dirs. In addition, with this change, it's possible to have incremental builds of tools, since the script no longer blows away the output directory. Committed: https://crrev.com/42d9711d127ddc3e192747ff0901c4c6c29b5eae Cr-Commit-Position: refs/heads/master@{#298152}

Patch Set 1 #

Patch Set 2 : Minor formatting tweak #

Total comments: 3
Unified diffs Side-by-side diffs Delta from patch set Stats (+53 lines, -58 lines) Patch
M tools/clang/CMakeLists.txt View 1 3 chunks +21 lines, -26 lines 0 comments Download
M tools/clang/blink_gc_plugin/CMakeLists.txt View 1 chunk +2 lines, -2 lines 0 comments Download
M tools/clang/empty_string/CMakeLists.txt View 1 chunk +1 line, -1 line 0 comments Download
M tools/clang/plugins/CMakeLists.txt View 1 chunk +2 lines, -2 lines 0 comments Download
M tools/clang/rewrite_scoped_refptr/CMakeLists.txt View 1 chunk +1 line, -1 line 0 comments Download
M tools/clang/scripts/update.sh View 5 chunks +26 lines, -26 lines 3 comments Download

Messages

Total messages: 10 (2 generated)
dcheng
Here's my preferred approach. It just creates a shim CMakeLists.txt and allows us to use ...
6 years, 2 months ago (2014-10-02 01:02:50 UTC) #2
hans
Sorry for the delay. I agree this is probably the nicer approach. Being more on ...
6 years, 2 months ago (2014-10-03 01:23:45 UTC) #3
dcheng
https://codereview.chromium.org/615083006/diff/20001/tools/clang/scripts/update.sh File tools/clang/scripts/update.sh (right): https://codereview.chromium.org/615083006/diff/20001/tools/clang/scripts/update.sh#newcode441 tools/clang/scripts/update.sh:441: CHROME_TOOLS_SHIM_DIR=${ABS_LLVM_DIR}/tools/chrometools On 2014/10/03 01:23:45, hans wrote: > Why aren't ...
6 years, 2 months ago (2014-10-03 03:47:51 UTC) #4
hans
lgtm https://codereview.chromium.org/615083006/diff/20001/tools/clang/scripts/update.sh File tools/clang/scripts/update.sh (right): https://codereview.chromium.org/615083006/diff/20001/tools/clang/scripts/update.sh#newcode441 tools/clang/scripts/update.sh:441: CHROME_TOOLS_SHIM_DIR=${ABS_LLVM_DIR}/tools/chrometools On 2014/10/03 03:47:51, dcheng wrote: > On ...
6 years, 2 months ago (2014-10-03 17:07:14 UTC) #5
dcheng
I've tested that this works on Mac/Linux before/after this patch without clobbering, so hopefully everything ...
6 years, 2 months ago (2014-10-04 00:12:11 UTC) #7
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/615083006/20001
6 years, 2 months ago (2014-10-04 00:17:29 UTC) #8
commit-bot: I haz the power
Committed patchset #2 (id:20001) as 1fb765347d1ff2041bcecc1bca447e0fa04a26dd
6 years, 2 months ago (2014-10-04 01:19:26 UTC) #9
commit-bot: I haz the power
6 years, 2 months ago (2014-10-04 01:20:38 UTC) #10
Message was sent while issue was closed.
Patchset 2 (id:??) landed as
https://crrev.com/42d9711d127ddc3e192747ff0901c4c6c29b5eae
Cr-Commit-Position: refs/heads/master@{#298152}

Powered by Google App Engine
This is Rietveld 408576698