diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2025-03-04 07:43:12 -0800 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2025-03-04 22:58:27 -0500 |
| commit | 751e8f1530dcf411f5e4d8acc758635316a77bcb (patch) | |
| tree | 46390a185c989d6374585e0076c3993243e749f5 | |
| parent | ec43d02577015694a7906c3d8e99cd418d8fc5ee (diff) | |
| download | meson-751e8f1530dcf411f5e4d8acc758635316a77bcb.tar.gz | |
coredata: fix handling of prefix
Which was improperly updated by the option store refactor.
Fixes: #14329
| -rw-r--r-- | mesonbuild/coredata.py | 5 | ||||
| -rw-r--r-- | test cases/linuxlike/3 linker script/meson.build | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index efcaf935a..7bc3cc218 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -571,12 +571,11 @@ class CoreData: # Set prefix first because it's needed to sanitize other options pfk = OptionKey('prefix') if pfk in opts_to_set: - prefix = self.sanitize_prefix(opts_to_set[pfk]) + prefix = self.optstore.sanitize_prefix(opts_to_set[pfk]) for key in options.BUILTIN_DIR_NOPREFIX_OPTIONS: if key not in opts_to_set: val = options.BUILTIN_OPTIONS[key].prefixed_default(key, prefix) - tmpkey = options.convert_oldkey(key) - dirty |= self.optstore.set_option(tmpkey, val) + dirty |= self.optstore.set_option(key, val) unknown_options: T.List[OptionKey] = [] for k, v in opts_to_set.items(): diff --git a/test cases/linuxlike/3 linker script/meson.build b/test cases/linuxlike/3 linker script/meson.build index 660858792..634b70b2c 100644 --- a/test cases/linuxlike/3 linker script/meson.build +++ b/test cases/linuxlike/3 linker script/meson.build @@ -1,4 +1,4 @@ -project('linker script', 'c') +project('linker script', 'c', default_options : {'prefix': '/tmp'}) # Solaris 11.4 ld supports --version-script only when you also specify # -z gnu-version-script-compat |