Skip to content

Commit b742d5c

Browse files
borsbors
authored
Auto merge of #2741 - alexcrichton:cdylib, r=brson
Add support for cdylib crate types And while we're at it this also extends support for all future crate types assuming that they aren't linkable by default.
2 parents f8e75ec + 3f7b09c commit b742d5c

File tree

7 files changed

+226
-226
lines changed

7 files changed

+226
-226
lines changed

‎src/cargo/core/manifest.rs

+25-20
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use rustc_serialize::{Encoder, Encodable};
66

77
use core::{Dependency, PackageId, PackageIdSpec, Summary};
88
use core::package_id::Metadata;
9-
use util::{CargoResult, human};
109

1110
/// Contains all the information about a package, as loaded from a Cargo.toml.
1211
#[derive(Clone, Debug)]
@@ -44,33 +43,40 @@ pub struct ManifestMetadata {
4443
pub documentation: Option<String>, // url
4544
}
4645

47-
#[derive(Debug, Clone, PartialEq, Eq, Hash, RustcEncodable, Copy)]
46+
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
4847
pub enum LibKind {
4948
Lib,
5049
Rlib,
5150
Dylib,
52-
StaticLib
51+
Other(String),
5352
}
5453

5554
impl LibKind {
56-
pub fn from_str(string: &str) -> CargoResult<LibKind> {
55+
pub fn from_str(string: &str) -> LibKind {
5756
match string {
58-
"lib" => Ok(LibKind::Lib),
59-
"rlib" => Ok(LibKind::Rlib),
60-
"dylib" => Ok(LibKind::Dylib),
61-
"staticlib" => Ok(LibKind::StaticLib),
62-
_ => Err(human(format!("crate-type \"{}\" was not one of lib|rlib|dylib|staticlib",
63-
string)))
57+
"lib" => LibKind::Lib,
58+
"rlib" => LibKind::Rlib,
59+
"dylib" => LibKind::Dylib,
60+
s => LibKind::Other(s.to_string()),
6461
}
6562
}
6663

6764
/// Returns the argument suitable for `--crate-type` to pass to rustc.
68-
pub fn crate_type(&self) -> &'static str {
65+
pub fn crate_type(&self) -> &str {
6966
match *self {
7067
LibKind::Lib => "lib",
7168
LibKind::Rlib => "rlib",
7269
LibKind::Dylib => "dylib",
73-
LibKind::StaticLib => "staticlib"
70+
LibKind::Other(ref s) => s,
71+
}
72+
}
73+
74+
pub fn linkable(&self) -> bool {
75+
match *self {
76+
LibKind::Lib |
77+
LibKind::Rlib |
78+
LibKind::Dylib => true,
79+
LibKind::Other(..) => false,
7480
}
7581
}
7682
}
@@ -335,12 +341,7 @@ impl Target {
335341
pub fn linkable(&self) -> bool {
336342
match self.kind {
337343
TargetKind::Lib(ref kinds) => {
338-
kinds.iter().any(|k| {
339-
match *k {
340-
LibKind::Lib | LibKind::Rlib | LibKind::Dylib => true,
341-
LibKind::StaticLib => false,
342-
}
343-
})
344+
kinds.iter().any(|k| k.linkable())
344345
}
345346
_ => false
346347
}
@@ -353,7 +354,7 @@ impl Target {
353354
pub fn is_custom_build(&self) -> bool { self.kind == TargetKind::CustomBuild }
354355

355356
/// Returns the arguments suitable for `--crate-type` to pass to rustc.
356-
pub fn rustc_crate_types(&self) -> Vec<&'static str> {
357+
pub fn rustc_crate_types(&self) -> Vec<&str> {
357358
match self.kind {
358359
TargetKind::Lib(ref kinds) => {
359360
kinds.iter().map(|kind| kind.crate_type()).collect()
@@ -368,7 +369,11 @@ impl Target {
368369

369370
pub fn can_lto(&self) -> bool {
370371
match self.kind {
371-
TargetKind::Lib(ref v) => *v == [LibKind::StaticLib],
372+
TargetKind::Lib(ref v) => {
373+
!v.contains(&LibKind::Rlib) &&
374+
!v.contains(&LibKind::Dylib) &&
375+
!v.contains(&LibKind::Lib)
376+
}
372377
_ => true,
373378
}
374379
}

‎src/cargo/ops/cargo_clean.rs

+21-15
Original file line numberDiff line numberDiff line change
@@ -42,45 +42,51 @@ pub fn clean(manifest_path: &Path, opts: &CleanOptions) -> CargoResult<()> {
4242
None => None,
4343
};
4444

45-
let cx = try!(Context::new(&resolve, &packages, opts.config,
46-
host_layout, target_layout,
47-
BuildConfig::default(),
48-
root.manifest().profiles()));
45+
let mut cx = try!(Context::new(&resolve, &packages, opts.config,
46+
host_layout, target_layout,
47+
BuildConfig::default(),
48+
root.manifest().profiles()));
49+
let mut units = Vec::new();
4950

50-
// resolve package specs and remove the corresponding packages
5151
for spec in opts.spec {
5252
// Translate the spec to a Package
5353
let pkgid = try!(resolve.query(spec));
5454
let pkg = try!(packages.get(&pkgid));
5555

56-
// And finally, clean everything out!
56+
// Generate all relevant `Unit` targets for this package
5757
for target in pkg.targets() {
5858
for kind in [Kind::Host, Kind::Target].iter() {
59-
let layout = cx.layout(&pkg, *kind);
60-
try!(rm_rf(&layout.proxy().fingerprint(&pkg)));
61-
try!(rm_rf(&layout.build(&pkg)));
6259
let Profiles {
6360
ref release, ref dev, ref test, ref bench, ref doc,
6461
ref custom_build, ref test_deps, ref bench_deps,
6562
} = *root.manifest().profiles();
6663
let profiles = [release, dev, test, bench, doc, custom_build,
6764
test_deps, bench_deps];
6865
for profile in profiles.iter() {
69-
let unit = Unit {
66+
units.push(Unit {
7067
pkg: &pkg,
7168
target: target,
7269
profile: profile,
7370
kind: *kind,
74-
};
75-
let root = cx.out_dir(&unit);
76-
for filename in try!(cx.target_filenames(&unit)).iter() {
77-
try!(rm_rf(&root.join(&filename)));
78-
}
71+
});
7972
}
8073
}
8174
}
8275
}
8376

77+
try!(cx.probe_target_info(&units));
78+
79+
for unit in units.iter() {
80+
let layout = cx.layout(&unit.pkg, unit.kind);
81+
try!(rm_rf(&layout.proxy().fingerprint(&unit.pkg)));
82+
try!(rm_rf(&layout.build(&unit.pkg)));
83+
84+
let root = cx.out_dir(&unit);
85+
for (filename, _) in try!(cx.target_filenames(&unit)) {
86+
try!(rm_rf(&root.join(&filename)));
87+
}
88+
}
89+
8490
Ok(())
8591
}
8692

0 commit comments

Comments
 (0)