diff options
| author | bors <bors@rust-lang.org> | 2014-02-17 03:26:51 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-17 03:26:51 -0800 |
| commit | 57d273f65e7dee2fb9a643a55d9337d2f75ee662 (patch) | |
| tree | d02f45db2243f978386fda275d43d893aeef1c3f /src | |
| parent | c8489069b43191c5298f17430933b3b88fb79c3c (diff) | |
| parent | 2b64cb294c7ceae003694e663458025a79f11da4 (diff) | |
| download | rust-57d273f65e7dee2fb9a643a55d9337d2f75ee662.tar.gz rust-57d273f65e7dee2fb9a643a55d9337d2f75ee662.zip | |
auto merge of #12284 : brson/rust/install, r=alexcrichton
Work toward #9876. This adds `prepare.mk`, which is simply a more heavily-parameterized `install.mk`, then uses `prepare` to implement both `install` and the windows installer (`dist`). Smoke tested on both Linux and Windows.
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/pkg/rust.iss | 2 | ||||
| -rw-r--r-- | src/librustdoc/lib.rs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/etc/pkg/rust.iss b/src/etc/pkg/rust.iss index 635d385d7c4..559ed0e860f 100644 --- a/src/etc/pkg/rust.iss +++ b/src/etc/pkg/rust.iss @@ -36,7 +36,7 @@ Uninstallable=yes Name: modifypath; Description: &Add {app}\bin to your PATH (recommended) [Files] -Source: "i686-pc-mingw32/stage3/*.*" ; DestDir: "{app}"; Flags: ignoreversion recursesubdirs +Source: "tmp/dist/win/*.*" ; DestDir: "{app}"; Flags: ignoreversion recursesubdirs [Code] const diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index 24c9d81e530..2c4d553a39f 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -12,6 +12,7 @@ #[desc = "rustdoc, the Rust documentation extractor"]; #[license = "MIT/ASL2"]; #[crate_type = "dylib"]; +#[crate_type = "rlib"]; #[feature(globs, struct_variant, managed_boxes)]; |