diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-10-18 20:55:10 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-10-18 20:55:10 +0300 |
| commit | ae06ca2afc58901d9d72f13f662701cf12281b51 (patch) | |
| tree | 25421861a84584438b39a3972b62d7398ac5d99b /environment.py | |
| parent | 4a899f2d9becbd204e6f63dbf4fb7be921a1ce71 (diff) | |
| download | meson-ae06ca2afc58901d9d72f13f662701cf12281b51.zip meson-ae06ca2afc58901d9d72f13f662701cf12281b51.tar.gz meson-ae06ca2afc58901d9d72f13f662701cf12281b51.tar.bz2 | |
User options now do a full round trip.
Diffstat (limited to 'environment.py')
| -rw-r--r-- | environment.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/environment.py b/environment.py index 3d3d18f..cbf9352 100644 --- a/environment.py +++ b/environment.py @@ -852,6 +852,15 @@ class Environment(): def is_source(self, fname): return is_source(fname) + def merge_options(self, options): + for (name, value) in options.items(): + if name not in self.coredata.user_options: + self.coredata.user_options[name] = value + else: + oldval = self.coredata.user_options[name] + if type(oldval) != type(value): + self.coredata.user_options[name] = value + def detect_c_compiler(self, want_cross): evar = 'CC' if self.is_cross_build() and want_cross: |