Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

x86_64-musl: allow building dylibs with -crt-static #38075

Closed
wants to merge 4 commits into from
Closed

x86_64-musl: allow building dylibs with -crt-static #38075

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76f4cef
x86_64-musl: allow building dylibs with -crt-static
Nov 29, 2016
f646a18
enable PIE for dynamically linked executables, refactor crt_static logic
Nov 30, 2016
57b323c
DRY more
Nov 30, 2016
a81e2b5
compilation fixes
Nov 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/librustc_back/target/linux_musl_base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ pub fn opts() -> TargetOptions {
// MUSL support doesn't currently include dynamic linking, so there's no
// need for dylibs or rpath business. Additionally `-pie` is incompatible
// with `-static`, so we can't pass `-pie`.
base.dynamic_linking = false;
base.dynamic_linking = true;
base.has_rpath = false;
base.position_independent_executables = false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm I wonder if this logic is insufficient now? Presumably we should pass -pie for dynamically linked musl executables?


Expand Down
11 changes: 10 additions & 1 deletion src/librustc_trans/back/link.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,16 @@ pub fn default_output_for_target(sess: &Session) -> config::CrateType {
/// Checks if target supports crate_type as output
pub fn invalid_output_for_target(sess: &Session,
crate_type: config::CrateType) -> bool {
match (sess.target.target.options.dynamic_linking,
let requested_features = sess.opts.cg.target_feature.split(',');
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This addition duplicates part of the add_configuration function (librustc_driver/target_feature.rs) and should be refactored into its own function.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps this logic could get refactored to a method on Session? I had it there originally but ended up not using it, but I feel like we should avoid duplicating that here.

let found_negative = requested_features.clone().any(|r| r == "-crt-static");
let found_positive = requested_features.clone().any(|r| r == "+crt-static");
let crt_static = if sess.target.target.options.crt_static_default {
!found_negative
} else {
found_positive
};

match (sess.target.target.options.dynamic_linking && !crt_static,
sess.target.target.options.executables, crate_type) {
(false, _, config::CrateTypeCdylib) |
(false, _, config::CrateTypeProcMacro) |
Expand Down