diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-08-17 16:01:49 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-08-17 16:01:49 +0300 |
| commit | 0465c7b96dee8517bf3c02f8e6ce71449fe038e5 (patch) | |
| tree | e5913d2cda1bd44af2ff724506b76e5886a83cd9 | |
| parent | fd7e8c540063870391e6ce75aa0fb179180fa057 (diff) | |
| download | meson-rustopt.tar.gz | |
Pass optimization flags to rustc properly. Closes: #5788.rustopt
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 1 | ||||
| -rw-r--r-- | mesonbuild/compilers/rust.py | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 978c16999..eb28f1a99 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1287,6 +1287,7 @@ int dummy; args += ['--crate-name', target.name] args += rustc.get_buildtype_args(self.get_option_for_target('buildtype', target)) args += rustc.get_debug_args(self.get_option_for_target('debug', target)) + args += rustc.get_optimization_args(self.get_option_for_target('optimization', target)) args += self.build.get_global_args(rustc, target.for_machine) args += self.build.get_project_args(rustc, target.subproject, target.for_machine) depfile = os.path.join(target.subdir, target.name + '.d') diff --git a/mesonbuild/compilers/rust.py b/mesonbuild/compilers/rust.py index 332cee681..665b3c2ad 100644 --- a/mesonbuild/compilers/rust.py +++ b/mesonbuild/compilers/rust.py @@ -19,11 +19,11 @@ from ..mesonlib import EnvironmentException, MachineChoice, Popen_safe from .compilers import Compiler, rust_buildtype_args, clike_debug_args rust_optimization_args = {'0': [], - 'g': ['-C', '--opt-level=0'], - '1': ['-C', '--opt-level=1'], - '2': ['-C', '--opt-level=2'], - '3': ['-C', '--opt-level=3'], - 's': ['-C', '--opt-level=s'], + 'g': ['-C', 'opt-level=0'], + '1': ['-C', 'opt-level=1'], + '2': ['-C', 'opt-level=2'], + '3': ['-C', 'opt-level=3'], + 's': ['-C', 'opt-level=s'], } class RustCompiler(Compiler): |