filter out rustc target based on machine type with meson >= 1.3.1; rel 2

meson 1.3.1 adds support for 'native: true' param that changes compiler
to one for build machine. same stands for doing 'rust_crate_type: proc-macro'

diff --git a/meson.spec b/meson.spec
index a27492d89153f1feba7fa49ed341da54e259d299..f07cd4f0e17baeb7106df8cd9afd173514c0e7df 100644 (file)
--- a/meson.spec
+++ b/meson.spec
@@ -2,7 +2,7 @@ Summary:        High productivity build system
 Summary(pl.UTF-8):     System budowania o dużej produktywności
 Name:          meson
 Version:       1.3.1
-Release:       1
+Release:       2
 License:       Apache v2.0
 Group:         Development/Tools
 #Source0Download: https://github.com/mesonbuild/meson/releases/

diff --git a/rust-proc-macro-filter-out-target.patch b/rust-proc-macro-filter-out-target.patch
index 11d97b40ce1d028254b56eec5ec1adfec0bb71af..94f61bb907415914a8275030869684cfa15ab787 100644 (file)
--- a/rust-proc-macro-filter-out-target.patch
+++ b/rust-proc-macro-filter-out-target.patch
@@ -30,7 +30,7 @@ index 73741a441..191db485d 100644
                  priv_dir = self.get_target_private_dir(lt)
                  commands += compiler.get_include_args(priv_dir, False)
 +        # filter out --target arguments for host only proc-macro crate
-+        if compiler.language == 'rust' and hasattr(target, 'rust_crate_type') and target.rust_crate_type == 'proc-macro':
++        if compiler.language == 'rust' and hasattr(target, 'for_machine') and target.for_machine == MachineChoice.BUILD:
 +            target_commands = []
 +            target_arg = False
 +            for (i, v) in enumerate(commands):