Skip to content

Haiku: several smaller fixes to build and run rust on Haiku#51757

Merged
bors merged 3 commits into
rust-lang:masterfrom
nielx:fix/haiku-fixes
Jul 6, 2018
Merged

Haiku: several smaller fixes to build and run rust on Haiku#51757
bors merged 3 commits into
rust-lang:masterfrom
nielx:fix/haiku-fixes

Conversation

@nielx

@nielx nielx commented Jun 24, 2018

Copy link
Copy Markdown
Contributor

This PR combines three small patches that help Rust build and run on the Haiku platform. These patches do not intend to impact other platforms.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @pnkfelix

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 24, 2018
@rust-highfive

Copy link
Copy Markdown
Contributor

The job x86_64-gnu-llvm-3.9 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[00:05:22] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:05:22] tidy error: /checkout/src/librustc_target/spec/x86_64_unknown_haiku.rs:20: trailing whitespace
[00:05:24] some tidy checks failed
[00:05:24] 
[00:05:24] 
[00:05:24] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:05:24] 
[00:05:24] 
[00:05:24] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:05:24] Build completed unsuccessfully in 0:01:57
[00:05:24] Build completed unsuccessfully in 0:01:57
[00:05:24] make: *** [tidy] Error 1
[00:05:24] Makefile:79: recipe for target 'tidy' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:19e6de5d
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:0be45cc8:start=1529852981047450369,finish=1529852981054116015,duration=6665646
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0889cc8a
$ head -30 ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
head: cannot open ‘./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers’ for reading: No such file or directory
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:20bf4fee
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

executables on x86_64

With the switch to gcc 7 the linker scripts don't always explicitly
add the `-pie` flag anymore. This creates build failures on x86_64.
Interestingly enough, adding this flag on i686 will lead to executables
that fail to run when ASLR is enabled, so let's keep it x86_64 only.
@nielx nielx force-pushed the fix/haiku-fixes branch from 7a8bdde to bbe45ce Compare June 24, 2018 15:30
@stokhos

stokhos commented Jun 29, 2018

Copy link
Copy Markdown

ping from triage, @pnkfelix ,will you have time to review this PR in near future?

@stokhos

stokhos commented Jul 6, 2018

Copy link
Copy Markdown

ping from triage @pnkfelix @rust-lang/compiler , will you have time to review this PR in near future?

@nagisa

nagisa commented Jul 6, 2018

Copy link
Copy Markdown
Member

@bors r+

Seems good to me.

@bors

bors commented Jul 6, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit bbe45ce has been approved by nagisa

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 6, 2018
@bors

bors commented Jul 6, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit bbe45ce with merge e06c875...

bors added a commit that referenced this pull request Jul 6, 2018
Haiku: several smaller fixes to build and run rust on Haiku

This PR combines three small patches that help Rust build and run on the Haiku platform. These patches do not intend to impact other platforms.
@bors

bors commented Jul 6, 2018

Copy link
Copy Markdown
Collaborator

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

@bors bors merged commit bbe45ce into rust-lang:master Jul 6, 2018
@nielx nielx deleted the fix/haiku-fixes branch July 31, 2018 19:09
@workingjubilee workingjubilee added the O-haiku Target: Be extant; from mouldering old leaves; spring arrives again label Jul 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

O-haiku Target: Be extant; from mouldering old leaves; spring arrives again S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants