Skip to content

fix built-in target detection #33363

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

Merged
merged 3 commits into from
Jul 27, 2016
Merged

fix built-in target detection #33363

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5943507
fix built-in target detection
May 2, 2016
ec616d5
refactor: if -> match
May 5, 2016
f438801
add include ../tools.mk to the Makefile
Jul 22, 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
3 changes: 1 addition & 2 deletions src/librustc_back/target/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,9 @@ macro_rules! supported_targets {

// this would use a match if stringify! were allowed in pattern position
Copy link
Contributor

Choose a reason for hiding this comment

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

is this comment stale now?

Copy link
Contributor

@durka durka May 3, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

(it wasn't true anyway)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

(it wasn't true anyway)

Actually it would look like this: http://is.gd/ot9Ta2

Now that we are using $triple instead of $module we can change this into a match. I'll send a follow up PR because this one already got pulled into the rollup.

Copy link
Contributor

Choose a reason for hiding this comment

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

looks like no longer in the rollup

fn load_specific(target: &str) -> Option<Target> {
let target = target.replace("-", "_");
if false { }
$(
else if target == stringify!($module) {
else if target == $triple {
let mut t = $module::target();
t.options.is_builtin = true;
debug!("Got builtin target: {:?}", t);
Expand Down
3 changes: 3 additions & 0 deletions src/test/run-make/issue-33329/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
all:
$(RUSTC) --target x86_64_unknown-linux-musl main.rs 2>&1 | \
grep "error: Error loading target specification: Could not find specification for target"
11 changes: 11 additions & 0 deletions src/test/run-make/issue-33329/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

fn main() {}