diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/environment.py | 15 | ||||
| -rw-r--r-- | mesonbuild/mesonmain.py | 7 |
2 files changed, 4 insertions, 18 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index a859bad..9b252a2 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -266,7 +266,7 @@ class Environment: private_dir = 'meson-private' log_dir = 'meson-logs' - def __init__(self, source_dir, build_dir, options, original_cmd_line_args): + def __init__(self, source_dir, build_dir, options): self.source_dir = source_dir self.build_dir = build_dir self.scratch_dir = os.path.join(build_dir, Environment.private_dir) @@ -289,7 +289,6 @@ class Environment: else: self.cross_info = None self.cmd_line_options = options - self.original_cmd_line_args = original_cmd_line_args # List of potential compilers. if mesonlib.is_windows(): @@ -374,18 +373,6 @@ class Environment: def is_library(self, fname): return is_library(fname) - def had_argument_for(self, option): - trial1 = coredata.get_builtin_option_cmdline_name(option) - trial2 = '-D' + option - previous_is_plaind = False - for i in self.original_cmd_line_args: - if i.startswith(trial1) or i.startswith(trial2): - return True - if previous_is_plaind and i.startswith(option): - return True - previous_is_plaind = i == '-D' - return False - @staticmethod def get_gnu_compiler_defines(compiler): """ diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py index 0d210c4..facd3a3 100644 --- a/mesonbuild/mesonmain.py +++ b/mesonbuild/mesonmain.py @@ -54,10 +54,9 @@ def wrapmodetype(string): class MesonApp: - def __init__(self, dir1, dir2, handshake, options, original_cmd_line_args): + def __init__(self, dir1, dir2, handshake, options): (self.source_dir, self.build_dir) = self.validate_dirs(dir1, dir2, handshake) self.options = options - self.original_cmd_line_args = original_cmd_line_args def has_build_file(self, dirname): fname = os.path.join(dirname, environment.build_filename) @@ -109,7 +108,7 @@ class MesonApp: env.coredata.pkgconf_envvar = curvar def generate(self): - env = environment.Environment(self.source_dir, self.build_dir, self.options, self.original_cmd_line_args) + env = environment.Environment(self.source_dir, self.build_dir, self.options) mlog.initialize(env.get_log_dir()) with mesonlib.BuildDirLock(self.build_dir): self._generate(env) @@ -334,7 +333,7 @@ def run(original_args, mainfile): else: dir2 = '.' try: - app = MesonApp(dir1, dir2, handshake, options, original_args) + app = MesonApp(dir1, dir2, handshake, options) except Exception as e: # Log directory does not exist, so just print # to stdout. |