Skip to content

Commit

Permalink
fix some typos (#604)
Browse files Browse the repository at this point in the history
  • Loading branch information
striezel committed May 26, 2021
1 parent ba48733 commit 1f50999
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ impl Build {
/// This option sets the `-stdlib` flag, which is only supported by some
/// compilers (clang, icc) but not by others (gcc). The library will not
/// detect which compiler is used, as such it is the responsibility of the
/// caller to ensure that this option is only used in conjuction with a
/// caller to ensure that this option is only used in conjunction with a
/// compiler which supports the `-stdlib` flag.
///
/// A value of `None` indicates that no specific C++ standard library should
Expand Down Expand Up @@ -1849,7 +1849,7 @@ impl Build {
for flag in self.ar_flags.iter() {
cmd.arg(flag);
}
// If the library file already exists, add the libary name
// If the library file already exists, add the library name
// as an argument to let lib.exe know we are appending the objs.
if dst.exists() {
cmd.arg(dst);
Expand Down Expand Up @@ -2124,7 +2124,7 @@ impl Build {
//
// As the shell script calls the main clang binary, the command line limit length
// on Windows is restricted to around 8k characters instead of around 32k characters.
// To remove this limit, we call the main clang binary directly and contruct the
// To remove this limit, we call the main clang binary directly and construct the
// `--target=` ourselves.
if host.contains("windows") && android_clang_compiler_uses_target_arg_internally(&tool.path)
{
Expand Down Expand Up @@ -2652,7 +2652,7 @@ impl Tool {
}

#[cfg(windows)]
/// Explictly set the `ToolFamily`, skipping name-based detection.
/// Explicitly set the `ToolFamily`, skipping name-based detection.
fn with_family(path: PathBuf, family: ToolFamily) -> Self {
Self {
path: path,
Expand Down
4 changes: 2 additions & 2 deletions src/windows_registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ pub fn find_vs_version() -> Result<VsVers, String> {
)),
},
_ => {
// Check for the presense of a specific registry key
// Check for the presence of a specific registry key
// that indicates visual studio is installed.
if impl_::has_msbuild_version("16.0") {
Ok(VsVers::Vs16)
Expand Down Expand Up @@ -676,7 +676,7 @@ mod impl_ {

// Interestingly there are several subdirectories, `win7` `win8` and
// `winv6.3`. Vcvars seems to only care about `winv6.3` though, so the same
// applies to us. Note that if we were targetting kernel mode drivers
// applies to us. Note that if we were targeting kernel mode drivers
// instead of user mode applications, we would care.
fn get_sdk81_dir() -> Option<PathBuf> {
let key = r"SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.1";
Expand Down

0 comments on commit 1f50999

Please sign in to comment.