diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-08-31 20:49:51 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-08-31 20:49:51 +0300 |
| commit | 30c9787cf7ee6eb50d956f02ba2930e04f1fb083 (patch) | |
| tree | 3ec018391b46eb75d18e14348e16e2ada3c21371 /environment.py | |
| parent | 6eb4474349917ff0fb99641ac6784002d7e5f698 (diff) | |
| download | meson-30c9787cf7ee6eb50d956f02ba2930e04f1fb083.zip meson-30c9787cf7ee6eb50d956f02ba2930e04f1fb083.tar.gz meson-30c9787cf7ee6eb50d956f02ba2930e04f1fb083.tar.bz2 | |
Fix objc/objpp detector funcs.
Diffstat (limited to 'environment.py')
| -rw-r--r-- | environment.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/environment.py b/environment.py index 58b4009..e6bd8c6 100644 --- a/environment.py +++ b/environment.py @@ -896,8 +896,8 @@ class Environment(): return VisualStudioCPPCompiler([compiler], version, is_cross, exe_wrap) raise EnvironmentException('Unknown compiler(s) "' + ', '.join(compilers) + '"') - def detect_objc_compiler(self): - if self.is_cross_build(): + def detect_objc_compiler(self, want_cross): + if self.is_cross_build() and want_cross: exelist = [self.cross_info['objc']] is_cross = True exe_wrap = self.cross_info.get('exe_wrapper', None) @@ -924,9 +924,9 @@ class Environment(): return GnuObjCCompiler(exelist, version, is_cross, exe_wrap) raise EnvironmentException('Unknown compiler "' + ' '.join(exelist) + '"') - def detect_objcpp_compiler(self): - if self.is_cross_build(): - exelist = [self.cross_info['objc']] + def detect_objcpp_compiler(self, want_cross): + if self.is_cross_build() and want_cross: + exelist = [self.cross_info['objcpp']] is_cross = True exe_wrap = self.cross_info.get('exe_wrapper', None) else: |