about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-07-14 06:37:30 -0700
committerGitHub <noreply@github.com>2016-07-14 06:37:30 -0700
commitfe5c439f695fd72b7be0d0f28ee8397b3256630c (patch)
tree88eba8429f64c712c05a2dfbaa66e097d04a0c71
parent6998018bcec10e8c754878e263e94d081e63950b (diff)
parent3205c513f3437ea3fb9c37166d3e95562f93d11f (diff)
downloadrust-fe5c439f695fd72b7be0d0f28ee8397b3256630c.tar.gz
rust-fe5c439f695fd72b7be0d0f28ee8397b3256630c.zip
Auto merge of #34783 - Dridi:cdylib_usage, r=alexcrichton
Mention the crate type cdylib in rustc's usage

Hello,

I just tried to build a `cdylib` with the latest stable release, I've been passively waiting for this for quite some time now. Tested successfully on my machine, although it doesn't appear in `rustc`'s usage it seems to work like a charm so far. :grinning:

Thanks!
-rw-r--r--man/rustc.12
-rw-r--r--src/librustc/session/config.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/man/rustc.1 b/man/rustc.1
index a034e471b6e..fa61afd3be5 100644
--- a/man/rustc.1
+++ b/man/rustc.1
@@ -44,7 +44,7 @@ The optional \fIKIND\fR can be one of \fIstatic\fR, \fIdylib\fR, or
 \fIframework\fR.
 If omitted, \fIdylib\fR is assumed.
 .TP
-\fB\-\-crate\-type\fR [bin|lib|rlib|dylib|staticlib]
+\fB\-\-crate\-type\fR [bin|lib|rlib|dylib|cdylib|staticlib]
 Comma separated list of types of crates for the compiler to emit.
 .TP
 \fB\-\-crate\-name\fR \fINAME\fR
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index ab9a0fcb19b..bc271e9ecc8 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -981,7 +981,7 @@ pub fn rustc_short_optgroups() -> Vec<RustcOptGroup> {
                              assumed.", "[KIND=]NAME"),
         opt::multi_s("", "crate-type", "Comma separated list of types of crates
                                     for the compiler to emit",
-                   "[bin|lib|rlib|dylib|staticlib]"),
+                   "[bin|lib|rlib|dylib|cdylib|staticlib]"),
         opt::opt_s("", "crate-name", "Specify the name of the crate being built",
                "NAME"),
         opt::multi_s("", "emit", "Comma separated list of types of output for \