@@ -129,12 +129,12 @@ pub enum Error {
129
129
/// Contains the command and the cause.
130
130
Command { command : String , cause : io:: Error } ,
131
131
132
- /// `pkg-config` did not exit sucessfully after probing a library.
132
+ /// `pkg-config` did not exit successfully after probing a library.
133
133
///
134
134
/// Contains the command and output.
135
135
Failure { command : String , output : Output } ,
136
136
137
- /// `pkg-config` did not exit sucessfully on the first attempt to probe a library.
137
+ /// `pkg-config` did not exit successfully on the first attempt to probe a library.
138
138
///
139
139
/// Contains the command and output.
140
140
ProbeFailure {
@@ -423,15 +423,15 @@ impl Config {
423
423
424
424
// pkg-config may not be aware of cross-compilation, and require
425
425
// a wrapper script that sets up platform-specific prefixes.
426
- match self . targetted_env_var ( "PKG_CONFIG_ALLOW_CROSS" ) {
426
+ match self . targeted_env_var ( "PKG_CONFIG_ALLOW_CROSS" ) {
427
427
// don't use pkg-config if explicitly disabled
428
428
Some ( ref val) if val == "0" => false ,
429
429
Some ( _) => true ,
430
430
None => {
431
431
// if not disabled, and pkg-config is customized,
432
432
// then assume it's prepared for cross-compilation
433
- self . targetted_env_var ( "PKG_CONFIG" ) . is_some ( )
434
- || self . targetted_env_var ( "PKG_CONFIG_SYSROOT_DIR" ) . is_some ( )
433
+ self . targeted_env_var ( "PKG_CONFIG" ) . is_some ( )
434
+ || self . targeted_env_var ( "PKG_CONFIG_SYSROOT_DIR" ) . is_some ( )
435
435
}
436
436
}
437
437
}
@@ -442,7 +442,7 @@ impl Config {
442
442
get_variable ( package, variable) . map_err ( |e| e. to_string ( ) )
443
443
}
444
444
445
- fn targetted_env_var ( & self , var_base : & str ) -> Option < OsString > {
445
+ fn targeted_env_var ( & self , var_base : & str ) -> Option < OsString > {
446
446
match ( env:: var ( "TARGET" ) , env:: var ( "HOST" ) ) {
447
447
( Ok ( target) , Ok ( host) ) => {
448
448
let kind = if host == target { "HOST" } else { "TARGET" } ;
@@ -477,7 +477,7 @@ impl Config {
477
477
}
478
478
479
479
fn run ( & self , name : & str , args : & [ & str ] ) -> Result < Vec < u8 > , Error > {
480
- let pkg_config_exe = self . targetted_env_var ( "PKG_CONFIG" ) ;
480
+ let pkg_config_exe = self . targeted_env_var ( "PKG_CONFIG" ) ;
481
481
let fallback_exe = if pkg_config_exe. is_none ( ) {
482
482
Some ( OsString :: from ( "pkgconf" ) )
483
483
} else {
@@ -518,13 +518,13 @@ impl Config {
518
518
}
519
519
cmd. args ( args) . args ( & self . extra_args ) ;
520
520
521
- if let Some ( value) = self . targetted_env_var ( "PKG_CONFIG_PATH" ) {
521
+ if let Some ( value) = self . targeted_env_var ( "PKG_CONFIG_PATH" ) {
522
522
cmd. env ( "PKG_CONFIG_PATH" , value) ;
523
523
}
524
- if let Some ( value) = self . targetted_env_var ( "PKG_CONFIG_LIBDIR" ) {
524
+ if let Some ( value) = self . targeted_env_var ( "PKG_CONFIG_LIBDIR" ) {
525
525
cmd. env ( "PKG_CONFIG_LIBDIR" , value) ;
526
526
}
527
- if let Some ( value) = self . targetted_env_var ( "PKG_CONFIG_SYSROOT_DIR" ) {
527
+ if let Some ( value) = self . targeted_env_var ( "PKG_CONFIG_SYSROOT_DIR" ) {
528
528
cmd. env ( "PKG_CONFIG_SYSROOT_DIR" , value) ;
529
529
}
530
530
if self . print_system_libs {
@@ -577,7 +577,7 @@ impl Config {
577
577
}
578
578
}
579
579
580
- // Implement Default manualy since Bound does not implement Default.
580
+ // Implement Default manually since Bound does not implement Default.
581
581
impl Default for Config {
582
582
fn default ( ) -> Config {
583
583
Config {
0 commit comments