diff options
| author | Josh Soref <jsoref@users.noreply.github.com> | 2017-11-26 06:15:13 +0000 |
|---|---|---|
| committer | Josh Soref <jsoref@users.noreply.github.com> | 2017-11-26 06:15:13 +0000 |
| commit | 2b0505f222f3626886c1f3bac42fea43fe6c93e1 (patch) | |
| tree | fa3302aaa7360847181a766e6e877426e93c9541 | |
| parent | 72ba9302aa836e125afebd4b45036df773f74ff0 (diff) | |
| download | meson-2b0505f222f3626886c1f3bac42fea43fe6c93e1.zip meson-2b0505f222f3626886c1f3bac42fea43fe6c93e1.tar.gz meson-2b0505f222f3626886c1f3bac42fea43fe6c93e1.tar.bz2 | |
spelling: targeting
| -rw-r--r-- | mesonbuild/environment.py | 2 | ||||
| -rw-r--r-- | test cases/osx/3 has function xcode8/meson.build | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 58cc9b9..0cb1450 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -154,7 +154,7 @@ def detect_windows_arch(compilers): # Check if we're using and inside an MSVC toolchain environment if compiler.id == 'msvc' and 'VCINSTALLDIR' in os.environ: # 'Platform' is only set when the target arch is not 'x86'. - # It's 'x64' when targetting x86_64 and 'arm' when targetting ARM. + # It's 'x64' when targeting x86_64 and 'arm' when targeting ARM. platform = os.environ.get('Platform', 'x86').lower() if platform == 'x86': return platform diff --git a/test cases/osx/3 has function xcode8/meson.build b/test cases/osx/3 has function xcode8/meson.build index 300d352..5fe3e53 100644 --- a/test cases/osx/3 has function xcode8/meson.build +++ b/test cases/osx/3 has function xcode8/meson.build @@ -10,16 +10,16 @@ args_10_12 = ['-mmacosx-version-min=10.12'] + sdk_args # Test requires XCode 8 which has the MacOSX 10.12 SDK if cc.version().version_compare('>=8.0') if cc.has_function('clock_gettime', args : args_10_11, prefix : '#include <time.h>') - error('Should not have found clock_gettime via <time.h> when targetting Mac OS X 10.11') + error('Should not have found clock_gettime via <time.h> when targeting Mac OS X 10.11') endif if not cc.has_function('clock_gettime', args : args_10_12, prefix : '#include <time.h>') - error('Did NOT find clock_gettime via <time.h> when targetting Mac OS X 10.12') + error('Did NOT find clock_gettime via <time.h> when targeting Mac OS X 10.12') endif if not cc.has_function('clock_gettime', args : args_10_11) - error('Did NOT find clock_gettime w/o a prototype when targetting Mac OS X 10.11') + error('Did NOT find clock_gettime w/o a prototype when targeting Mac OS X 10.11') endif if not cc.has_function('clock_gettime', args : args_10_12) - error('Did NOT find clock_gettime w/o a prototype when targetting Mac OS X 10.12') + error('Did NOT find clock_gettime w/o a prototype when targeting Mac OS X 10.12') endif else message('Test needs XCode 8, skipping...') |