rustbuild: A few tweaks by petrochenkov · Pull Request #40236 · rust-lang/rust

petrochenkov · 2017-03-03T15:27:27Z

alexcrichton · 2017-03-03T16:24:13Z

+ pub timestamp: PathBuf,
+}
+
+pub fn native_lib_boilerplate(src_name: &str,


Could you add some comments here as well as to how this function is expected to be called? It looks like there's a standard rigamarole of checking skip_build and then creating the timestamp at the end, and it'd be good to enusre that's all documented.

alexcrichton · 2017-03-03T16:26:41Z

Just one minor request for a comment but otherwise looks great to me, thanks!

r=me

petrochenkov · 2017-03-03T18:10:04Z

@alexcrichton
Updated with comments for native_lib_boilerplate.
I also automated timestamp creation and partially build skipping, it should be simpler this way.

alexcrichton · 2017-03-03T19:25:37Z

@bors: r+

bors · 2017-03-03T19:25:38Z

📌 Commit 384f64a has been approved by alexcrichton

@alexcrichton

rustbuild: A few tweaks Fixesrust-lang#40016Fixesrust-lang#39507 r? @alexcrichton

bors · 2017-03-04T01:49:33Z

☔ The latest upstream changes (presumably #39917) made this pull request unmergeable. Please resolve the merge conflicts.

petrochenkov · 2017-03-04T12:47:47Z

@bors r=alexcrichton

bors · 2017-03-04T12:47:48Z

📌 Commit a1c6471 has been approved by alexcrichton

bors · 2017-03-04T14:51:23Z

⌛ Testing commit a1c6471 with merge d7d1dd0...

bors · 2017-03-04T15:20:07Z

💔 Test failed - status-travis

petrochenkov · 2017-03-04T15:28:37Z

Spurious (?) failure in the middle of LLVM build due to sccache (?).
Or it may be some interaction between LLVM build caching used on CI and de2af63.

@bors retry

petrochenkov · 2017-03-04T16:05:40Z

@alexcrichton

What are reuse requirements for building LLVM on Travis/Appveyor with caching, by the way?

What I want with local builds is:

if llvm-finished-building does not exist, do not delete the build directory, reuse it (REUSE)
if llvm-finished-building exists and differs from llvm-auto-clean-trigger, do not delete the build directory, reuse it (REUSE)
if llvm-finished-building exists and is equal to llvm-auto-clean-trigger, then do not try to build anything at all (SKIP)
fresh build is done only if something really bad happens and I delete the build directory manually, so this PR doesn't quite do what I'd like to see ideally.

As I understand, what CI wants is:

if llvm-finished-building does not exist, delete the build directory, do a fresh build accelerated by (s)ccache (FRESH)
if llvm-finished-building exists and differs from llvm-auto-clean-trigger, delete the build directory, do a fresh build accelerated by (s)ccache (FRESH)
if llvm-finished-building exists and is equal to llvm-auto-clean-trigger, then do not try to build anything at all (SKIP)
i.e. CI always does either full reuse or, failing that, accelerated fresh build, because reuse provided by caching tools is considered more reliable than one provided by CMake.

Is my understanding correct?
If it's correct, then a new option in config.toml switching between these two use cases would be a better solution than what de2af63 does.

bors · 2017-03-04T18:27:08Z

🔒 Merge conflict

Move some code from x.py to bootstrap.py

Add some comments

Add comments

petrochenkov · 2017-03-04T19:20:53Z

@bors r=alexcrichton

bors · 2017-03-04T19:20:54Z

📌 Commit 428f063 has been approved by alexcrichton

bors · 2017-03-04T19:21:02Z

⌛ Testing commit 428f063 with merge ba07bd5...

@alexcrichton

rustbuild: A few tweaks Fixes#40016Fixes#39507 r? @alexcrichton

bors · 2017-03-04T21:28:57Z

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing ba07bd5 to master...

@alexcrichton

rustbuild: Add option for enabling partial LLVM rebuilds @alexcrichton , you probably didn't notice my [late comment](#40236 (comment)) on #40236, but here's an implementation of that suggestion, it supersedes c652a4f. r? @alexcrichton

rust-highfive assigned alexcrichton Mar 3, 2017

alexcrichton reviewed Mar 3, 2017
View reviewed changes

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 3, 2017
Rollup merge ofrust-lang#40236- petrochenkov:btweak, r=alexcrichton
6efb3b2
rustbuild: A few tweaks Fixesrust-lang#40016Fixesrust-lang#39507 r? @alexcrichton

frewsxcv mentioned this pull request Mar 3, 2017
Rollup of 6 pull requests #40249
Closed

petrochenkov force-pushed the btweak branch from 384f64a to a1c6471Compare March 4, 2017 12:47

petrochenkov added 8 commits March 4, 2017 21:38

Add/remove rerun-if-changed when necessary
f218709

Support combination MSVC + Ninja
a7c8afd

Build compiler-rt and sanitizers only once
aeadc81

run-make on MSVC: Do not generate object files in the source directory
3b45466

bootstrap.py: Report build status
11adac3
Move some code from x.py to bootstrap.py

Separate "ui-fulldeps" tests from "ui" tests
e2f6185

Do not purge LLVM build directory on rebuild
c652a4f
Add some comments

Automate timestamp creation and build skipping for native libraries
428f063
Add comments

petrochenkov force-pushed the btweak branch from a1c6471 to 428f063Compare March 4, 2017 19:20

bors added a commit that referenced this pull request Mar 4, 2017
Auto merge of#40236- petrochenkov:btweak, r=alexcrichton
ba07bd5
rustbuild: A few tweaks Fixes#40016Fixes#39507 r? @alexcrichton

bors merged commit 428f063 into rust-lang:masterMar 4, 2017

petrochenkov mentioned this pull request Mar 7, 2017
rustbuild: Add option for enabling partial LLVM rebuilds #40329
Merged

alexcrichton mentioned this pull request Mar 8, 2017
Spurious "file exists" exception in libcompiler_builtins build script #40358
Closed

petrochenkov deleted the btweak branch March 16, 2017 19:42

Uh oh!

Uh oh!

Conversation

petrochenkov commented Mar 3, 2017

Uh oh!

alexcrichtonMar 3, 2017

Choose a reason for hiding this comment

Uh oh!

alexcrichton commented Mar 3, 2017

Uh oh!

petrochenkov commented Mar 3, 2017

Uh oh!

alexcrichton commented Mar 3, 2017

Uh oh!

bors commented Mar 3, 2017

Uh oh!

bors commented Mar 4, 2017

Uh oh!

petrochenkov commented Mar 4, 2017

Uh oh!

bors commented Mar 4, 2017

Uh oh!

bors commented Mar 4, 2017

Uh oh!

bors commented Mar 4, 2017

Uh oh!

petrochenkov commented Mar 4, 2017

Uh oh!

petrochenkov commented Mar 4, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Mar 4, 2017

Uh oh!

petrochenkov commented Mar 4, 2017

Uh oh!

bors commented Mar 4, 2017

Uh oh!

bors commented Mar 4, 2017

Uh oh!

bors commented Mar 4, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

petrochenkov commented Mar 4, 2017•
edited
Loading