diff options
| author | Haibo Huang <hhb@google.com> | 2020-11-20 02:05:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-20 02:05:52 +0000 |
| commit | ef10236592f0f75969d7604cc7d6fb41d9ed97fc (patch) | |
| tree | bf0a82fc25167b32feb495c85288e1532e4bd6aa | |
| parent | b8bdd5afcb957335f943244b297e65e380946528 (diff) | |
| parent | 64fc21b911309cc06cdeab84272397f9c0dc7c2b (diff) | |
| download | clang-sys-ef10236592f0f75969d7604cc7d6fb41d9ed97fc.tar.gz | |
Upgrade rust/crates/clang-sys to 1.0.3 am: 430b0554f8 am: 64fc21b911
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/clang-sys/+/1505791
Change-Id: I68b1e6e4045412f3671a3a3ccc412ba6c3678190
| -rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | Cargo.toml.orig | 2 | ||||
| -rw-r--r-- | METADATA | 6 | ||||
| -rw-r--r-- | src/support.rs | 8 |
6 files changed, 17 insertions, 8 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index a6a7b1b..f643705 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,5 +1,5 @@ { "git": { - "sha1": "a5f2b5fef678dd436d16750922f59b2146c9b055" + "sha1": "b11a95758757bc1163cd06a32c94709d2cbae92d" } } diff --git a/CHANGELOG.md b/CHANGELOG.md index a114fb6..8b67c3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [1.0.3] - 2020-11-19 + +### Fixed +- Fixed `Clang::find` panicking when `llvm-config` or `xcode-build` don't output anything to `stdout` + ## [1.0.2] - 2020-11-17 ### Fixed @@ -12,7 +12,7 @@ [package] name = "clang-sys" -version = "1.0.2" +version = "1.0.3" authors = ["Kyle Mayes <kyle@mayeses.com>"] build = "build.rs" links = "clang" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 2986183..a6dcb14 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -3,7 +3,7 @@ name = "clang-sys" authors = ["Kyle Mayes <kyle@mayeses.com>"] -version = "1.0.2" +version = "1.0.3" readme = "README.md" license = "Apache-2.0" @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/clang-sys/clang-sys-1.0.2.crate" + value: "https://static.crates.io/crates/clang-sys/clang-sys-1.0.3.crate" } - version: "1.0.2" + version: "1.0.3" license_type: NOTICE last_upgrade_date { year: 2020 month: 11 - day: 17 + day: 19 } } diff --git a/src/support.rs b/src/support.rs index 2441487..8422f59 100644 --- a/src/support.rs +++ b/src/support.rs @@ -84,11 +84,15 @@ impl Clang { paths.push(path.into()); } if let Ok(path) = run_llvm_config(&["--bindir"]) { - paths.push(path.lines().next().unwrap().into()); + if let Some(line) = path.lines().next() { + paths.push(line.into()); + } } if cfg!(target_os = "macos") { if let Ok((path, _)) = run("xcodebuild", &["-find", "clang"]) { - paths.push(path.lines().next().unwrap().into()); + if let Some(line) = path.lines().next() { + paths.push(line.into()); + } } } paths.extend(env::split_paths(&env::var("PATH").unwrap())); |