adaptation to rustbuild for openbsd #38451

semarie · 2016-12-18T11:35:48Z

Since the switch to rustbuild, the build for openbsd is broken:

ar inference based on compiler name is wrong (OpenBSD usually use egcc, but ear doesn't exist)
make isn't GNU-make under OpenBSD (and others BSD platforms)
stdc++ isn't the right stdc++ library to link with (it should be estdc++)
corrects tests that don't pass anymore (problems related to rustbuild)

OpenBSD usually use an alternative compiler (`egcc') from ports. But the `ar' is unprefixed as it comes from base.

the backtrace test doesn't work on openbsd as it doesn't have support for libbacktrace without using filename.

the diff extends build_helper to provide an function to return the expected name of GNU-make on the host: "make" or "gmake". Fixes rust-lang#38429

semarie · 2016-12-18T11:38:44Z

The make commit will close #38429.

The implementation statically bound "gmake" to BSD and let "make" to others. Eventually, I could add the use of a variable MAKE to override the behaviour ?

semarie · 2016-12-18T17:39:58Z

I think I will keep some tests failing with vanilla configuration: the fact that egcc compiler isn't used (but cc) for some tests, make them to fail: cc (GCC 4.2) is unable to link properly estdc++ library when the test needs it.

A simple workaround is to have a directory in front of PATH with a symbolic link cc to egcc.

stdc++ is from base, and is an old library (GCC 4.2) estdc++ is from ports, and is a recent library (GCC 4.9 currently) as LLVM requires the newer version, use it if under OpenBSD.

alexcrichton · 2016-12-18T18:06:57Z

Looks good to me, thanks! When this is ready just lemme know and I'll r+

semarie · 2016-12-19T05:44:32Z

I have a failing test (check-std-all) that seems related to build_helper and cargo features. I am unsure if it is related to my commits or not.

executing step Step { name: "check-std-all", stage: 2, host: "x86_64-unknown-openbsd", target: "x86_64-unknown-openbsd" }
Testing libstd stage2 (x86_64-unknown-openbsd -> x86_64-unknown-openbsd)
running: "/data/semarie/obj/rust-installs/beta/bin/cargo" "test" "-j" "4" "--target" "x86_64-unknown-openbsd" "-v" "--release" "--frozen" "--manifest-path" "/data/semarie/src/rust/src/rustc/std_shim/Cargo.toml" "--features" "panic-unwind jemalloc backtrace" "-p" "std_shim" "-p" "std" "-p" "rand" "-p" "libc" "-p" "compiler_builtins" "-p"
"alloc" "-p" "collections" "-p" "unwind" "-p" "std_unicode" "-p" "panic_abort" "-p" "build_helper" "-p" "alloc_system" "-p" "core" "--"
error: Package `build_helper v0.1.0 (file:///data/semarie/src/rust/src/build_helper)` does not have these features: `backtrace, panic-unwind, jemalloc`


command did not execute successfully: "/data/semarie/obj/rust-installs/beta/bin/cargo" "test" "-j" "4" "--target" "x86_64-unknown-openbsd" "-v" "--release" "--frozen" "--manifest-path" "/data/semarie/src/rust/src/rustc/std_shim/Cargo.toml" "--features" "panic-unwind jemalloc backtrace" "-p" "std_shim" "-p" "std" "-p" "rand" "-p" "libc" "-p" "compiler_builtins" "-p" "alloc" "-p" "collections" "-p" "unwind" "-p" "std_unicode" "-p" "panic_abort" "-p"
"build_helper" "-p" "alloc_system" "-p" "core" "--"
expected success, got: exit code: 101

semarie · 2016-12-19T07:37:01Z

hum. it could be my cargo binary that is too old. It is a 0.13.0.

semarie · 2016-12-19T13:17:37Z

@alexcrichton it is ok now. My cargo was too old for correctly performing tests without errors.

As side note, I found it is more and more complex to build rustc now. I hope to not having to port a new platform (full cross-compiling isn't always possible) due to interdependance of rustc and cargo (and libc which needs cargo too to properly check it).

alexcrichton · 2016-12-19T16:21:17Z

@semarie I'm not sure I understand the sentiment that building is more complex now? The only difference is that building the compiler requires Cargo now as opposed to just a previous rustc. Otherwise the build system should take care of everything.

alexcrichton · 2016-12-19T16:21:49Z

@bors: r+

In any case, changes look good to me!

bors · 2016-12-19T16:21:51Z

📌 Commit 2c39ee1 has been approved by alexcrichton

semarie · 2016-12-19T16:28:51Z

If you already have "correct libc" + "rustc" + "cargo", there are no problem with the build system. But porting a new platform to Rust will require additionnal effort due to the interdependance of these three components.

@alexcrichton

…ichton adaptation to rustbuild for openbsd Since the switch to rustbuild, the build for openbsd is broken: - [X] `ar` inference based on compiler name is wrong (OpenBSD usually use `egcc`, but `ear` doesn't exist) - [X] `make` isn't GNU-make under OpenBSD (and others BSD platforms) - [x] `stdc++` isn't the right stdc++ library to link with (it should be `estdc++`) - [x] corrects tests that don't pass anymore (problems related to rustbuild) r? @alexcrichton

Rollup of 29 pull requests - Successful merges: #37761, #38006, #38131, #38150, #38158, #38171, #38208, #38215, #38236, #38245, #38289, #38302, #38315, #38346, #38388, #38395, #38398, #38418, #38432, #38451, #38463, #38468, #38470, #38471, #38472, #38478, #38486, #38493, #38498 - Failed merges: #38271, #38483

A tweak was made to dependencies in rust-lang#38451 but the makefiles weren't updated to accompany this. Instead of trying to integerate the `build_helper` crate into the makefiles (which currently isn't present) this commit takes the approach of just duplicating the required logic, which should be small enough for now.

mk: Fix compile with makefiles A tweak was made to dependencies in #38451 but the makefiles weren't updated to accompany this. Instead of trying to integerate the `build_helper` crate into the makefiles (which currently isn't present) this commit takes the approach of just duplicating the required logic, which should be small enough for now.

brson · 2017-01-19T18:58:59Z

Nominated per https://internals.rust-lang.org/t/rust-1-15-release-status/4590/11

A tweak was made to dependencies in rust-lang#38451 but the makefiles weren't updated to accompany this. Instead of trying to integerate the `build_helper` crate into the makefiles (which currently isn't present) this commit takes the approach of just duplicating the required logic, which should be small enough for now.

semarie added 3 commits December 17, 2016 14:48

Disconnect ar from cc on OpenBSD

dd0fc0a

OpenBSD usually use an alternative compiler (`egcc') from ports. But the `ar' is unprefixed as it comes from base.

disable run-pass/backtrace for openbsd

9f8c1e2

the backtrace test doesn't work on openbsd as it doesn't have support for libbacktrace without using filename.

let BSD to use gmake for GNU-make

a7d9025

the diff extends build_helper to provide an function to return the expected name of GNU-make on the host: "make" or "gmake". Fixes rust-lang#38429

rust-highfive assigned alexcrichton Dec 18, 2016

OpenBSD has two stdc++ libraries: use the newer

2c39ee1

stdc++ is from base, and is an old library (GCC 4.2) estdc++ is from ports, and is a recent library (GCC 4.9 currently) as LLVM requires the newer version, use it if under OpenBSD.

semarie force-pushed the openbsd-rustbuild branch from ba025b2 to 2c39ee1 Compare December 18, 2016 17:43

semarie changed the title ~~WIP: adaptation to rustbuild for openbsd~~ adaptation to rustbuild for openbsd Dec 19, 2016

alexcrichton mentioned this pull request Dec 20, 2016

Rollup of 29 pull requests #38499

Merged

bors merged commit 2c39ee1 into rust-lang:master Dec 21, 2016

alexcrichton mentioned this pull request Dec 21, 2016

mk: Fix compile with makefiles #38506

Merged

semarie deleted the openbsd-rustbuild branch December 21, 2016 04:30

brson added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 19, 2017

alexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 19, 2017

brson mentioned this pull request Jan 19, 2017

Beta next #39189

Merged

alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 19, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

adaptation to rustbuild for openbsd #38451

adaptation to rustbuild for openbsd #38451

semarie commented Dec 18, 2016 •

edited

Loading

semarie commented Dec 18, 2016

semarie commented Dec 18, 2016

alexcrichton commented Dec 18, 2016

semarie commented Dec 19, 2016

semarie commented Dec 19, 2016 •

edited

Loading

semarie commented Dec 19, 2016

alexcrichton commented Dec 19, 2016

alexcrichton commented Dec 19, 2016

bors commented Dec 19, 2016

semarie commented Dec 19, 2016

brson commented Jan 19, 2017

adaptation to rustbuild for openbsd #38451

adaptation to rustbuild for openbsd #38451

Conversation

semarie commented Dec 18, 2016 • edited Loading

semarie commented Dec 18, 2016

semarie commented Dec 18, 2016

alexcrichton commented Dec 18, 2016

semarie commented Dec 19, 2016

semarie commented Dec 19, 2016 • edited Loading

semarie commented Dec 19, 2016

alexcrichton commented Dec 19, 2016

alexcrichton commented Dec 19, 2016

bors commented Dec 19, 2016

semarie commented Dec 19, 2016

brson commented Jan 19, 2017

semarie commented Dec 18, 2016 •

edited

Loading

semarie commented Dec 19, 2016 •

edited

Loading