2012-12-03 18:48:01 -06:00
|
|
|
// Copyright 2012 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.
|
|
|
|
|
2012-07-04 16:53:12 -05:00
|
|
|
//! Validates all used crates and extern libraries and loads their metadata
|
2011-03-15 18:30:43 -05:00
|
|
|
|
2013-12-25 12:10:33 -06:00
|
|
|
use driver::{driver, session};
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
use driver::session::Session;
|
2013-12-25 12:10:33 -06:00
|
|
|
use metadata::csearch;
|
2012-12-23 16:41:37 -06:00
|
|
|
use metadata::cstore;
|
|
|
|
use metadata::decoder;
|
|
|
|
use metadata::loader;
|
2013-12-25 12:10:33 -06:00
|
|
|
use metadata::loader::Os;
|
2012-12-23 16:41:37 -06:00
|
|
|
|
2013-12-21 20:17:29 -06:00
|
|
|
use std::cell::RefCell;
|
2013-06-28 17:32:26 -05:00
|
|
|
use std::hashmap::HashMap;
|
2013-07-19 20:42:11 -05:00
|
|
|
use syntax::ast;
|
2013-11-30 13:39:55 -06:00
|
|
|
use syntax::abi;
|
2012-09-04 13:54:36 -05:00
|
|
|
use syntax::attr;
|
2013-07-19 06:51:37 -05:00
|
|
|
use syntax::attr::AttrMetaMethods;
|
2014-02-09 21:29:21 -06:00
|
|
|
use syntax::codemap::{Span};
|
2013-12-31 08:17:59 -06:00
|
|
|
use syntax::diagnostic::SpanHandler;
|
2013-12-25 12:10:33 -06:00
|
|
|
use syntax::ext::base::{CrateLoader, MacroCrate};
|
2014-01-10 16:02:36 -06:00
|
|
|
use syntax::parse::token::{IdentInterner, InternedString};
|
2013-06-04 14:34:25 -05:00
|
|
|
use syntax::parse::token;
|
2013-12-28 11:16:48 -06:00
|
|
|
use syntax::crateid::CrateId;
|
2013-08-26 04:01:39 -05:00
|
|
|
use syntax::visit;
|
2011-03-15 18:30:43 -05:00
|
|
|
|
2012-07-03 18:11:00 -05:00
|
|
|
// Traverses an AST, reading all the information about use'd crates and extern
|
2011-07-07 23:03:09 -05:00
|
|
|
// libraries necessary for later resolving, typechecking, linking, etc.
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
pub fn read_crates(sess: Session,
|
2014-02-05 15:15:24 -06:00
|
|
|
krate: &ast::Crate,
|
2013-08-31 11:13:04 -05:00
|
|
|
os: loader::Os,
|
2014-01-09 07:05:33 -06:00
|
|
|
intr: @IdentInterner) {
|
2013-12-21 18:46:55 -06:00
|
|
|
let mut e = Env {
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
sess: sess,
|
2013-02-04 16:02:01 -06:00
|
|
|
os: os,
|
2013-12-22 16:55:41 -06:00
|
|
|
crate_cache: @RefCell::new(~[]),
|
2013-02-04 16:02:01 -06:00
|
|
|
next_crate_num: 1,
|
|
|
|
intr: intr
|
|
|
|
};
|
2014-02-05 15:15:24 -06:00
|
|
|
visit_crate(&e, krate);
|
2013-12-21 18:46:55 -06:00
|
|
|
{
|
|
|
|
let mut v = ReadCrateVisitor {
|
|
|
|
e: &mut e
|
|
|
|
};
|
2014-02-05 15:15:24 -06:00
|
|
|
visit::walk_crate(&mut v, krate, ());
|
2013-12-21 18:46:55 -06:00
|
|
|
}
|
2013-12-22 16:55:41 -06:00
|
|
|
let crate_cache = e.crate_cache.borrow();
|
|
|
|
dump_crates(*crate_cache.get());
|
|
|
|
warn_if_multiple_versions(&mut e, sess.diagnostic(), *crate_cache.get());
|
2013-12-21 18:46:55 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
struct ReadCrateVisitor<'a> {
|
|
|
|
e: &'a mut Env,
|
2012-04-06 01:42:32 -05:00
|
|
|
}
|
|
|
|
|
2013-12-21 18:46:55 -06:00
|
|
|
impl<'a> visit::Visitor<()> for ReadCrateVisitor<'a> {
|
2014-01-09 07:05:33 -06:00
|
|
|
fn visit_view_item(&mut self, a: &ast::ViewItem, _: ()) {
|
2013-08-26 04:01:39 -05:00
|
|
|
visit_view_item(self.e, a);
|
|
|
|
visit::walk_view_item(self, a, ());
|
|
|
|
}
|
2014-01-09 07:05:33 -06:00
|
|
|
fn visit_item(&mut self, a: &ast::Item, _: ()) {
|
2013-08-26 04:01:39 -05:00
|
|
|
visit_item(self.e, a);
|
|
|
|
visit::walk_item(self, a, ());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-12 11:39:19 -05:00
|
|
|
#[deriving(Clone)]
|
2013-02-19 01:40:42 -06:00
|
|
|
struct cache_entry {
|
2013-11-26 23:02:25 -06:00
|
|
|
cnum: ast::CrateNum,
|
2013-08-31 11:13:04 -05:00
|
|
|
span: Span,
|
2014-01-31 14:17:03 -06:00
|
|
|
hash: ~str,
|
2013-12-28 11:16:48 -06:00
|
|
|
crateid: CrateId,
|
2013-02-19 01:40:42 -06:00
|
|
|
}
|
2012-04-06 01:42:32 -05:00
|
|
|
|
2013-06-27 08:04:22 -05:00
|
|
|
fn dump_crates(crate_cache: &[cache_entry]) {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("resolved crates:");
|
2013-08-03 11:45:23 -05:00
|
|
|
for entry in crate_cache.iter() {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("cnum: {:?}", entry.cnum);
|
|
|
|
debug!("span: {:?}", entry.span);
|
|
|
|
debug!("hash: {:?}", entry.hash);
|
2012-04-09 17:06:38 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-21 18:46:55 -06:00
|
|
|
fn warn_if_multiple_versions(e: &mut Env,
|
2013-12-27 15:48:00 -06:00
|
|
|
diag: @SpanHandler,
|
2013-06-27 08:04:22 -05:00
|
|
|
crate_cache: &[cache_entry]) {
|
2012-06-04 10:03:14 -05:00
|
|
|
if crate_cache.len() != 0u {
|
2013-12-28 11:16:48 -06:00
|
|
|
let name = crate_cache[crate_cache.len() - 1].crateid.name.clone();
|
2013-03-05 21:39:18 -06:00
|
|
|
|
2013-08-12 11:39:19 -05:00
|
|
|
let (matches, non_matches) = crate_cache.partitioned(|entry|
|
2013-12-28 11:16:48 -06:00
|
|
|
name == entry.crateid.name);
|
2012-04-06 01:42:32 -05:00
|
|
|
|
2013-03-28 20:39:09 -05:00
|
|
|
assert!(!matches.is_empty());
|
2012-04-06 01:42:32 -05:00
|
|
|
|
|
|
|
if matches.len() != 1u {
|
2012-05-22 19:48:04 -05:00
|
|
|
diag.handler().warn(
|
2013-09-28 00:38:08 -05:00
|
|
|
format!("using multiple versions of crate `{}`", name));
|
2013-08-03 11:45:23 -05:00
|
|
|
for match_ in matches.iter() {
|
2013-05-19 00:07:44 -05:00
|
|
|
diag.span_note(match_.span, "used here");
|
2013-12-28 11:16:48 -06:00
|
|
|
loader::note_crateid_attr(diag, &match_.crateid);
|
2012-04-06 01:42:32 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-27 08:04:22 -05:00
|
|
|
warn_if_multiple_versions(e, diag, non_matches);
|
2012-04-06 01:42:32 -05:00
|
|
|
}
|
2011-07-07 23:03:09 -05:00
|
|
|
}
|
|
|
|
|
2013-02-04 16:02:01 -06:00
|
|
|
struct Env {
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
sess: Session,
|
2013-08-31 11:13:04 -05:00
|
|
|
os: loader::Os,
|
2013-12-22 16:55:41 -06:00
|
|
|
crate_cache: @RefCell<~[cache_entry]>,
|
2013-07-19 00:38:55 -05:00
|
|
|
next_crate_num: ast::CrateNum,
|
2014-01-09 07:05:33 -06:00
|
|
|
intr: @IdentInterner
|
2013-02-04 16:02:01 -06:00
|
|
|
}
|
2011-07-07 23:37:56 -05:00
|
|
|
|
2013-07-19 00:38:55 -05:00
|
|
|
fn visit_crate(e: &Env, c: &ast::Crate) {
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
let cstore = e.sess.cstore;
|
2013-02-16 09:21:56 -06:00
|
|
|
|
2014-01-08 12:35:15 -06:00
|
|
|
for a in c.attrs.iter().filter(|m| m.name().equiv(&("link_args"))) {
|
2013-07-19 06:51:37 -05:00
|
|
|
match a.value_str() {
|
2014-01-10 16:02:36 -06:00
|
|
|
Some(ref linkarg) => cstore.add_used_link_args(linkarg.get()),
|
|
|
|
None => { /* fallthrough */ }
|
2013-02-16 09:21:56 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-09 07:05:33 -06:00
|
|
|
fn visit_view_item(e: &mut Env, i: &ast::ViewItem) {
|
2013-12-25 12:10:33 -06:00
|
|
|
let should_load = i.attrs.iter().all(|attr| {
|
2014-01-21 12:08:10 -06:00
|
|
|
attr.name().get() != "phase" ||
|
2013-12-25 12:10:33 -06:00
|
|
|
attr.meta_item_list().map_or(false, |phases| {
|
|
|
|
attr::contains_name(phases, "link")
|
|
|
|
})
|
|
|
|
});
|
|
|
|
|
|
|
|
if !should_load {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
match extract_crate_info(i) {
|
|
|
|
Some(info) => {
|
2014-01-31 14:17:03 -06:00
|
|
|
let cnum = resolve_crate(e,
|
2014-02-09 21:29:21 -06:00
|
|
|
None,
|
2014-01-31 14:17:03 -06:00
|
|
|
info.ident.clone(),
|
|
|
|
info.name.clone(),
|
|
|
|
info.version.clone(),
|
|
|
|
~"",
|
|
|
|
i.span);
|
2013-12-25 12:10:33 -06:00
|
|
|
e.sess.cstore.add_extern_mod_stmt_cnum(info.id, cnum);
|
|
|
|
}
|
|
|
|
None => ()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
struct CrateInfo {
|
2014-01-31 14:17:03 -06:00
|
|
|
ident: ~str,
|
|
|
|
name: ~str,
|
|
|
|
version: ~str,
|
2013-12-25 12:10:33 -06:00
|
|
|
id: ast::NodeId,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn extract_crate_info(i: &ast::ViewItem) -> Option<CrateInfo> {
|
2013-03-20 00:17:42 -05:00
|
|
|
match i.node {
|
2014-02-13 23:07:09 -06:00
|
|
|
ast::ViewItemExternMod(ident, ref path_opt, id) => {
|
|
|
|
let ident = token::get_ident(ident);
|
2014-02-14 12:10:06 -06:00
|
|
|
debug!("resolving extern crate stmt. ident: {:?} path_opt: {:?}",
|
2014-02-13 23:07:09 -06:00
|
|
|
ident, path_opt);
|
2014-01-21 12:08:10 -06:00
|
|
|
let (name, version) = match *path_opt {
|
2014-01-15 20:30:40 -06:00
|
|
|
Some((ref path_str, _)) => {
|
|
|
|
let crateid: Option<CrateId> = from_str(path_str.get());
|
2013-12-25 12:10:33 -06:00
|
|
|
match crateid {
|
2014-01-31 14:17:03 -06:00
|
|
|
None => (~"", ~""),
|
2013-12-25 12:10:33 -06:00
|
|
|
Some(crateid) => {
|
|
|
|
let version = match crateid.version {
|
2014-01-31 14:17:03 -06:00
|
|
|
None => ~"",
|
|
|
|
Some(ref ver) => ver.to_str(),
|
2013-12-25 12:10:33 -06:00
|
|
|
};
|
2014-01-31 14:17:03 -06:00
|
|
|
(crateid.name.to_str(), version)
|
2013-12-25 12:10:33 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-01-31 14:17:03 -06:00
|
|
|
None => (ident.get().to_str(), ~""),
|
2013-12-25 12:10:33 -06:00
|
|
|
};
|
|
|
|
Some(CrateInfo {
|
2014-01-31 14:17:03 -06:00
|
|
|
ident: ident.get().to_str(),
|
2013-12-25 12:10:33 -06:00
|
|
|
name: name,
|
|
|
|
version: version,
|
|
|
|
id: id,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
_ => None
|
|
|
|
}
|
2011-07-07 23:37:56 -05:00
|
|
|
}
|
|
|
|
|
2014-01-09 07:05:33 -06:00
|
|
|
fn visit_item(e: &Env, i: &ast::Item) {
|
2013-03-20 00:17:42 -05:00
|
|
|
match i.node {
|
2014-01-09 07:05:33 -06:00
|
|
|
ast::ItemForeignMod(ref fm) => {
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
if fm.abis.is_rust() || fm.abis.is_intrinsic() {
|
|
|
|
return;
|
|
|
|
}
|
2013-10-10 14:57:34 -05:00
|
|
|
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
// First, add all of the custom link_args attributes
|
|
|
|
let cstore = e.sess.cstore;
|
|
|
|
let link_args = i.attrs.iter()
|
2014-01-08 12:35:15 -06:00
|
|
|
.filter_map(|at| if at.name().equiv(&("link_args")) {
|
|
|
|
Some(at)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
})
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
.to_owned_vec();
|
|
|
|
for m in link_args.iter() {
|
|
|
|
match m.value_str() {
|
2014-01-10 16:02:36 -06:00
|
|
|
Some(linkarg) => cstore.add_used_link_args(linkarg.get()),
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
None => { /* fallthrough */ }
|
|
|
|
}
|
|
|
|
}
|
2012-09-04 18:40:11 -05:00
|
|
|
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
// Next, process all of the #[link(..)]-style arguments
|
|
|
|
let cstore = e.sess.cstore;
|
|
|
|
let link_args = i.attrs.iter()
|
2014-01-08 12:35:15 -06:00
|
|
|
.filter_map(|at| if at.name().equiv(&("link")) {
|
|
|
|
Some(at)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
})
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
.to_owned_vec();
|
|
|
|
for m in link_args.iter() {
|
|
|
|
match m.meta_item_list() {
|
|
|
|
Some(items) => {
|
2013-11-28 20:03:38 -06:00
|
|
|
let kind = items.iter().find(|k| {
|
2014-01-08 12:35:15 -06:00
|
|
|
k.name().equiv(&("kind"))
|
2013-11-28 20:03:38 -06:00
|
|
|
}).and_then(|a| a.value_str());
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
let kind = match kind {
|
|
|
|
Some(k) => {
|
2014-01-10 16:02:36 -06:00
|
|
|
if k.equiv(&("static")) {
|
2013-11-30 13:39:55 -06:00
|
|
|
cstore::NativeStatic
|
|
|
|
} else if e.sess.targ_cfg.os == abi::OsMacos &&
|
2014-01-10 16:02:36 -06:00
|
|
|
k.equiv(&("framework")) {
|
2013-11-30 13:39:55 -06:00
|
|
|
cstore::NativeFramework
|
2014-01-10 16:02:36 -06:00
|
|
|
} else if k.equiv(&("framework")) {
|
2013-11-30 13:39:55 -06:00
|
|
|
e.sess.span_err(m.span,
|
|
|
|
"native frameworks are only available \
|
|
|
|
on OSX targets");
|
|
|
|
cstore::NativeUnknown
|
|
|
|
} else {
|
|
|
|
e.sess.span_err(m.span,
|
|
|
|
format!("unknown kind: `{}`", k));
|
|
|
|
cstore::NativeUnknown
|
|
|
|
}
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
}
|
|
|
|
None => cstore::NativeUnknown
|
|
|
|
};
|
2013-11-28 20:03:38 -06:00
|
|
|
let n = items.iter().find(|n| {
|
2014-01-08 12:35:15 -06:00
|
|
|
n.name().equiv(&("name"))
|
2013-11-28 20:03:38 -06:00
|
|
|
}).and_then(|a| a.value_str());
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
let n = match n {
|
|
|
|
Some(n) => n,
|
|
|
|
None => {
|
2013-11-30 13:39:55 -06:00
|
|
|
e.sess.span_err(m.span,
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
"#[link(...)] specified without \
|
|
|
|
`name = \"foo\"`");
|
2014-01-10 16:02:36 -06:00
|
|
|
InternedString::new("foo")
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
}
|
|
|
|
};
|
2014-01-10 16:02:36 -06:00
|
|
|
if n.get().is_empty() {
|
2013-12-19 09:29:39 -06:00
|
|
|
e.sess.span_err(m.span, "#[link(name = \"\")] given with empty name");
|
|
|
|
} else {
|
2014-01-10 16:02:36 -06:00
|
|
|
cstore.add_used_library(n.get().to_owned(), kind);
|
2013-12-19 09:29:39 -06:00
|
|
|
}
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
}
|
|
|
|
None => {}
|
2013-02-16 11:48:28 -06:00
|
|
|
}
|
2011-07-27 07:19:39 -05:00
|
|
|
}
|
2011-07-07 23:37:56 -05:00
|
|
|
}
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
_ => { }
|
2011-07-07 23:37:56 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-13 23:07:09 -06:00
|
|
|
fn existing_match(e: &Env, name: &str, version: &str, hash: &str) -> Option<ast::CrateNum> {
|
2013-12-22 16:55:41 -06:00
|
|
|
let crate_cache = e.crate_cache.borrow();
|
|
|
|
for c in crate_cache.get().iter() {
|
2013-12-28 11:16:48 -06:00
|
|
|
let crateid_version = match c.crateid.version {
|
2014-01-31 14:17:03 -06:00
|
|
|
None => ~"0.0",
|
|
|
|
Some(ref ver) => ver.to_str(),
|
2013-12-09 15:56:53 -06:00
|
|
|
};
|
2014-02-13 23:07:09 -06:00
|
|
|
if (name.is_empty() || name == c.crateid.name) &&
|
|
|
|
(version.is_empty() || version == crateid_version) &&
|
|
|
|
(hash.is_empty() || hash == c.hash) {
|
2012-08-20 14:23:37 -05:00
|
|
|
return Some(c.cnum);
|
2012-06-04 10:03:14 -05:00
|
|
|
}
|
|
|
|
}
|
2013-12-09 15:56:53 -06:00
|
|
|
None
|
2012-04-05 20:31:03 -05:00
|
|
|
}
|
|
|
|
|
2013-12-21 18:46:55 -06:00
|
|
|
fn resolve_crate(e: &mut Env,
|
2014-02-09 21:29:21 -06:00
|
|
|
root_ident: Option<~str>,
|
2014-01-31 14:17:03 -06:00
|
|
|
ident: ~str,
|
|
|
|
name: ~str,
|
|
|
|
version: ~str,
|
|
|
|
hash: ~str,
|
2013-08-31 11:13:04 -05:00
|
|
|
span: Span)
|
2013-07-19 00:38:55 -05:00
|
|
|
-> ast::CrateNum {
|
2014-02-13 23:07:09 -06:00
|
|
|
match existing_match(e, name, version, hash) {
|
2012-08-20 14:23:37 -05:00
|
|
|
None => {
|
2013-02-19 01:40:42 -06:00
|
|
|
let load_ctxt = loader::Context {
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
sess: e.sess,
|
2012-05-22 19:16:26 -05:00
|
|
|
span: span,
|
|
|
|
ident: ident,
|
2014-02-13 23:07:09 -06:00
|
|
|
name: name,
|
2013-12-09 15:56:53 -06:00
|
|
|
version: version,
|
2012-05-22 19:16:26 -05:00
|
|
|
hash: hash,
|
2012-05-22 19:48:04 -05:00
|
|
|
os: e.os,
|
2012-07-18 18:18:02 -05:00
|
|
|
intr: e.intr
|
2012-05-22 19:16:26 -05:00
|
|
|
};
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
let loader::Library {
|
|
|
|
dylib, rlib, metadata
|
2014-02-09 21:29:21 -06:00
|
|
|
} = load_ctxt.load_library_crate(root_ident.clone());
|
2011-07-08 14:40:16 -05:00
|
|
|
|
2013-12-18 16:10:28 -06:00
|
|
|
let attrs = decoder::get_crate_attributes(metadata.as_slice());
|
2013-12-27 18:14:01 -06:00
|
|
|
let crateid = attr::find_crateid(attrs).unwrap();
|
2013-12-18 16:10:28 -06:00
|
|
|
let hash = decoder::get_crate_hash(metadata.as_slice());
|
2012-04-05 20:31:03 -05:00
|
|
|
|
2011-07-08 14:55:38 -05:00
|
|
|
// Claim this crate number and cache it
|
2011-07-27 07:19:39 -05:00
|
|
|
let cnum = e.next_crate_num;
|
2013-12-22 16:55:41 -06:00
|
|
|
{
|
|
|
|
let mut crate_cache = e.crate_cache.borrow_mut();
|
|
|
|
crate_cache.get().push(cache_entry {
|
|
|
|
cnum: cnum,
|
|
|
|
span: span,
|
|
|
|
hash: hash,
|
2013-12-28 11:16:48 -06:00
|
|
|
crateid: crateid,
|
2013-12-22 16:55:41 -06:00
|
|
|
});
|
|
|
|
}
|
2011-07-08 14:04:52 -05:00
|
|
|
e.next_crate_num += 1;
|
2011-07-08 14:40:16 -05:00
|
|
|
|
2014-02-09 21:29:21 -06:00
|
|
|
// Maintain a reference to the top most crate.
|
|
|
|
let root_crate = match root_ident {
|
|
|
|
Some(c) => c,
|
|
|
|
None => load_ctxt.ident.clone()
|
|
|
|
};
|
|
|
|
|
2011-07-08 14:55:38 -05:00
|
|
|
// Now resolve the crates referenced by this crate
|
2014-02-09 21:29:21 -06:00
|
|
|
let cnum_map = resolve_crate_deps(e,
|
|
|
|
Some(root_crate),
|
|
|
|
metadata.as_slice(),
|
|
|
|
span);
|
2011-07-08 14:55:38 -05:00
|
|
|
|
2013-02-19 01:40:42 -06:00
|
|
|
let cmeta = @cstore::crate_metadata {
|
2014-02-13 23:07:09 -06:00
|
|
|
name: load_ctxt.name,
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
data: metadata,
|
2013-02-19 01:40:42 -06:00
|
|
|
cnum_map: cnum_map,
|
|
|
|
cnum: cnum
|
|
|
|
};
|
2011-07-08 14:55:38 -05:00
|
|
|
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
let cstore = e.sess.cstore;
|
2013-12-25 14:08:04 -06:00
|
|
|
cstore.set_crate_data(cnum, cmeta);
|
|
|
|
cstore.add_used_crate_source(cstore::CrateSource {
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
dylib: dylib,
|
|
|
|
rlib: rlib,
|
|
|
|
cnum: cnum,
|
|
|
|
});
|
2012-08-01 19:30:05 -05:00
|
|
|
return cnum;
|
2012-04-05 20:31:03 -05:00
|
|
|
}
|
2012-08-20 14:23:37 -05:00
|
|
|
Some(cnum) => {
|
2012-08-01 19:30:05 -05:00
|
|
|
return cnum;
|
2012-04-05 20:31:03 -05:00
|
|
|
}
|
|
|
|
}
|
2011-07-08 14:55:38 -05:00
|
|
|
}
|
2011-05-26 19:16:54 -05:00
|
|
|
|
2011-07-08 14:55:38 -05:00
|
|
|
// Go through the crate metadata and load any crates that it references
|
2014-02-09 21:29:21 -06:00
|
|
|
fn resolve_crate_deps(e: &mut Env,
|
|
|
|
root_ident: Option<~str>,
|
|
|
|
cdata: &[u8], span : Span)
|
|
|
|
-> cstore::cnum_map {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("resolving deps of external crate");
|
2011-07-08 14:55:38 -05:00
|
|
|
// The map from crate numbers in the crate we're resolving to local crate
|
|
|
|
// numbers
|
2013-04-03 08:28:36 -05:00
|
|
|
let mut cnum_map = HashMap::new();
|
2013-06-21 07:29:53 -05:00
|
|
|
let r = decoder::get_crate_deps(cdata);
|
2013-08-03 11:45:23 -05:00
|
|
|
for dep in r.iter() {
|
2011-07-27 07:19:39 -05:00
|
|
|
let extrn_cnum = dep.cnum;
|
2014-02-13 23:07:09 -06:00
|
|
|
let cname_str = token::get_ident(dep.name);
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("resolving dep crate {} ver: {} hash: {}",
|
2013-06-12 12:02:55 -05:00
|
|
|
cname_str, dep.vers, dep.hash);
|
2014-01-31 14:17:03 -06:00
|
|
|
match existing_match(e,
|
2014-02-13 23:07:09 -06:00
|
|
|
cname_str.get(),
|
|
|
|
dep.vers,
|
|
|
|
dep.hash) {
|
2012-08-20 14:23:37 -05:00
|
|
|
Some(local_cnum) => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("already have it");
|
2011-07-08 14:55:38 -05:00
|
|
|
// We've already seen this crate
|
|
|
|
cnum_map.insert(extrn_cnum, local_cnum);
|
2012-04-05 20:31:03 -05:00
|
|
|
}
|
2012-08-20 14:23:37 -05:00
|
|
|
None => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("need to load it");
|
2011-07-08 14:55:38 -05:00
|
|
|
// This is a new one so we've got to load it
|
2014-01-31 14:17:03 -06:00
|
|
|
let local_cnum = resolve_crate(e,
|
2014-02-09 21:29:21 -06:00
|
|
|
root_ident.clone(),
|
2014-01-31 14:17:03 -06:00
|
|
|
cname_str.get().to_str(),
|
|
|
|
cname_str.get().to_str(),
|
|
|
|
dep.vers.clone(),
|
|
|
|
dep.hash.clone(),
|
2014-02-09 21:29:21 -06:00
|
|
|
span);
|
2011-07-08 14:55:38 -05:00
|
|
|
cnum_map.insert(extrn_cnum, local_cnum);
|
2012-04-05 20:31:03 -05:00
|
|
|
}
|
2011-07-08 14:55:38 -05:00
|
|
|
}
|
|
|
|
}
|
2013-12-21 20:17:29 -06:00
|
|
|
return @RefCell::new(cnum_map);
|
2011-07-08 14:55:38 -05:00
|
|
|
}
|
2013-12-25 12:10:33 -06:00
|
|
|
|
|
|
|
pub struct Loader {
|
|
|
|
priv env: Env,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Loader {
|
|
|
|
pub fn new(sess: Session) -> Loader {
|
|
|
|
let os = driver::get_os(driver::host_triple()).unwrap();
|
|
|
|
let os = session::sess_os_to_meta_os(os);
|
|
|
|
Loader {
|
|
|
|
env: Env {
|
|
|
|
sess: sess,
|
|
|
|
os: os,
|
|
|
|
crate_cache: @RefCell::new(~[]),
|
|
|
|
next_crate_num: 1,
|
|
|
|
intr: token::get_ident_interner(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl CrateLoader for Loader {
|
2014-02-05 15:15:24 -06:00
|
|
|
fn load_crate(&mut self, krate: &ast::ViewItem) -> MacroCrate {
|
|
|
|
let info = extract_crate_info(krate).unwrap();
|
2014-01-31 14:17:03 -06:00
|
|
|
let cnum = resolve_crate(&mut self.env,
|
2014-02-09 21:29:21 -06:00
|
|
|
None,
|
2014-01-31 14:17:03 -06:00
|
|
|
info.ident.clone(),
|
|
|
|
info.name.clone(),
|
|
|
|
info.version.clone(),
|
|
|
|
~"",
|
2014-02-05 15:15:24 -06:00
|
|
|
krate.span);
|
2013-12-25 12:10:33 -06:00
|
|
|
let library = self.env.sess.cstore.get_used_crate_source(cnum).unwrap();
|
|
|
|
MacroCrate {
|
|
|
|
lib: library.dylib,
|
|
|
|
cnum: cnum
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-22 01:09:53 -06:00
|
|
|
fn get_exported_macros(&mut self, cnum: ast::CrateNum) -> ~[~str] {
|
2013-12-25 12:10:33 -06:00
|
|
|
csearch::get_exported_macros(self.env.sess.cstore, cnum)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn get_registrar_symbol(&mut self, cnum: ast::CrateNum) -> Option<~str> {
|
|
|
|
let cstore = self.env.sess.cstore;
|
|
|
|
csearch::get_macro_registrar_fn(cstore, cnum)
|
|
|
|
.map(|did| csearch::get_symbol(cstore, did))
|
|
|
|
}
|
|
|
|
}
|