Allow static and dynamic linking

.travis.yml

@@ -10,24 +10,10 @@ env:
   global:
     - CARGO_TARGET_DIR=/tmp/bindgen
   matrix:
-    - LLVM_VERSION="3.8" BINDGEN_JOB="test"         BINDGEN_PROFILE=
-    - LLVM_VERSION="3.8" BINDGEN_JOB="test"         BINDGEN_PROFILE="--release"
-    - LLVM_VERSION="3.8" BINDGEN_JOB="integration"  BINDGEN_PROFILE=
-    - LLVM_VERSION="3.8" BINDGEN_JOB="integration"  BINDGEN_PROFILE="--release"
-    - LLVM_VERSION="3.8" BINDGEN_JOB="nofeatures"   BINDGEN_PROFILE=
-    - LLVM_VERSION="3.8" BINDGEN_JOB="nofeatures"   BINDGEN_PROFILE="--release"
-    - LLVM_VERSION="3.9" BINDGEN_JOB="test"         BINDGEN_PROFILE=
-    - LLVM_VERSION="3.9" BINDGEN_JOB="test"         BINDGEN_PROFILE="--release"
-    - LLVM_VERSION="3.9" BINDGEN_JOB="integration"  BINDGEN_PROFILE=
-    - LLVM_VERSION="3.9" BINDGEN_JOB="integration"  BINDGEN_PROFILE="--release"
-    - LLVM_VERSION="3.9" BINDGEN_JOB="nofeatures"   BINDGEN_PROFILE=
-    - LLVM_VERSION="3.9" BINDGEN_JOB="nofeatures"   BINDGEN_PROFILE="--release"
     - LLVM_VERSION="4.0" BINDGEN_JOB="test"         BINDGEN_PROFILE=
     - LLVM_VERSION="4.0" BINDGEN_JOB="test"         BINDGEN_PROFILE="--release"
     - LLVM_VERSION="4.0" BINDGEN_JOB="integration"  BINDGEN_PROFILE=
     - LLVM_VERSION="4.0" BINDGEN_JOB="integration"  BINDGEN_PROFILE="--release"
-    - LLVM_VERSION="4.0" BINDGEN_JOB="nofeatures"   BINDGEN_PROFILE=
-    - LLVM_VERSION="4.0" BINDGEN_JOB="nofeatures"   BINDGEN_PROFILE="--release"
     - LLVM_VERSION="5.0" BINDGEN_JOB="test"         BINDGEN_PROFILE=
     - LLVM_VERSION="5.0" BINDGEN_JOB="test"         BINDGEN_PROFILE="--release"
     - LLVM_VERSION="5.0" BINDGEN_JOB="test"         BINDGEN_PROFILE=            BINDGEN_FEATURES="testing_only_extra_assertions"

Cargo.toml

@@ -49,7 +49,7 @@ cexpr = "0.3.3"
 cfg-if = "0.1.0"
 # This kinda sucks: https://github.com/rust-lang/cargo/issues/1982
 clap = { version = "2", optional = true }
-clang-sys = { version = "0.28.0", features = ["runtime", "clang_6_0"] }
+clang-sys = { version = "0.28.0", features = ["clang_6_0"] }
 lazycell = "1"
 lazy_static = "1"
 peeking_take_while = "0.1.2"
@@ -71,9 +71,10 @@ optional = true
 version = "0.4"
 
 [features]
-default = ["logging", "clap", "which-rustfmt"]
+default = ["logging", "clap", "runtime", "which-rustfmt"]
 logging = ["env_logger", "log"]
-static = []
+static = ["clang-sys/static"]
+runtime = ["clang-sys/runtime"]
 # Dynamically discover a `rustfmt` binary using the `which` crate
 which-rustfmt = ["which"]
 

src/lib.rs

@@ -96,7 +96,6 @@ use std::fs::{File, OpenOptions};
 use std::io::{self, Write};
 use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
-use std::sync::Arc;
 use std::{env, iter};
 
 // Some convenient typedefs for a fast hash map and hash set.
@@ -1720,6 +1719,7 @@ impl Default for BindgenOptions {
     }
 }
 
+#[cfg(feature = "runtime")]
 fn ensure_libclang_is_loaded() {
     if clang_sys::is_loaded() {
         return;
@@ -1730,7 +1730,7 @@ fn ensure_libclang_is_loaded() {
     // across different threads.
 
     lazy_static! {
-        static ref LIBCLANG: Arc<clang_sys::SharedLibrary> = {
+        static ref LIBCLANG: std::sync::Arc<clang_sys::SharedLibrary> = {
             clang_sys::load().expect("Unable to find libclang");
             clang_sys::get_library().expect(
                 "We just loaded libclang and it had better still be \
@@ -1742,6 +1742,10 @@ fn ensure_libclang_is_loaded() {
     clang_sys::set_library(Some(LIBCLANG.clone()));
 }
 
+#[cfg(not(feature = "runtime"))]
+fn ensure_libclang_is_loaded() {
+}
+
 /// Generated Rust bindings.
 #[derive(Debug)]
 pub struct Bindings {
@@ -1756,10 +1760,13 @@ impl Bindings {
     ) -> Result<Bindings, ()> {
         ensure_libclang_is_loaded();
 
+        #[cfg(feature = "runtime")]
         debug!(
             "Generating bindings, libclang at {}",
             clang_sys::get_library().unwrap().path().display()
         );
+        #[cfg(not(feature = "runtime"))]
+        debug!("Generating bindings, libclang linked");
 
         options.build();
 
@@ -2115,10 +2122,7 @@ pub struct ClangVersion {
 
 /// Get the major and the minor semver numbers of Clang's version
 pub fn clang_version() -> ClangVersion {
-    if !clang_sys::is_loaded() {
-        // TODO(emilio): Return meaningful error (breaking).
-        clang_sys::load().expect("Unable to find libclang");
-    }
+    ensure_libclang_is_loaded();
 
     let raw_v: String = clang::extract_clang_version();
     let split_v: Option<Vec<&str>> = raw_v