Fix target detection for cdylib.

Adapted from rust-lang#186, thanks @smbolton.

Author: ehuss

rust/cargo_config.py

@@ -238,7 +238,7 @@ def items_target(self):
             # AFAIK, when there are multiple "kind" values, this only happens
             # when there are multiple library kinds.
             kind = target['kind'][0]
-            if kind in ('lib', 'rlib', 'dylib', 'staticlib', 'proc-macro'):
+            if kind in ('lib', 'rlib', 'dylib', 'cdylib', 'staticlib', 'proc-macro'):
                 kinds.setdefault('lib', []).append(('Lib', '--lib'))
             elif kind in ('bin', 'test', 'example', 'bench'):
                 text = '%s: %s' % (kind.capitalize(), target['name'])
@@ -915,7 +915,7 @@ def get_cargo_metadata(window, cwd):
                 - kind: List of kinds.  May contain multiple entries if
                   `crate-type` specifies multiple values in Cargo.toml.
                   Lots of different types of values:
-                    - Libraries: 'lib', 'rlib', 'dylib', 'staticlib',
+                    - Libraries: 'lib', 'rlib', 'dylib', 'cdylib', 'staticlib',
                       'proc-macro'
                     - Executables: 'bin', 'test', 'example', 'bench'
                     - build.rs: 'custom-build'

rust/target_detect.py

@@ -92,16 +92,16 @@ def _target_to_args(self, target):
         # generally you only use one command-line argument to build multiple
         # "kinds" (--lib in this case).
         #
-        # Nightly beware:  [[example]] that specifies crate-type will no
-        # longer show up as "example", making it impossible to compile.
+        # Caution:  [[example]] that specifies crate-type had issues before
+        # 1.17.
         # See https://github.com/rust-lang/cargo/pull/3556 and
         # https://github.com/rust-lang/cargo/issues/3572
         # https://github.com/rust-lang/cargo/pull/3668  (ISSUE FIXED)
         #
         # For now, just grab the first kind since it will always result in the
         # same arguments.
         kind = target['kind'][0]
-        if kind in ('lib', 'rlib', 'dylib', 'staticlib', 'proc-macro'):
+        if kind in ('lib', 'rlib', 'dylib', 'cdylib', 'staticlib', 'proc-macro'):
             return (target['src_path'], ['--lib'])
         elif kind in ('bin', 'test', 'example', 'bench'):
             return (target['src_path'], ['--' + kind, target['name']])

tests/multi-targets/Cargo.toml

@@ -52,3 +52,9 @@ name = "exlib"
 path = "examples/exlib.rs"
 crate-type = ["dylib"]
 test = false
+
+[[example]]
+name = "excdylib"
+path = "examples/excdylib.rs"
+crate-type = ["cdylib"]
+test = false

tests/multi-targets/examples/excdylib.rs

@@ -0,0 +1,3 @@
+pub fn somefunc() {
+    println!("somefunc");
+}

tests/multi-targets/libs/cdylib/Cargo.lock

@@ -0,0 +1,6 @@
+[package]
+name = "cdylib"
+version = "0.1.0"
+
+[lib]
+crate-type = ["cdylib"]

tests/multi-targets/libs/cdylib/Cargo.toml

@@ -0,0 +1,2 @@
+fn f() {
+}

tests/multi-targets/libs/cdylib/src/lib.rs

@@ -0,0 +1,6 @@
+[package]
+name = "dylib"
+version = "0.1.0"
+
+[lib]
+crate-type = ["dylib"]

tests/multi-targets/libs/dylib/Cargo.lock

@@ -0,0 +1,2 @@
+fn f() {
+}