commit 00ccc09cd695bf9dad5ff82ec36b6e30985e478f
author C Stout <cstout@google.com> Wed Mar 20 16:42:45 2024 -0700
committer CQ Bot <fuchsia-internal-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Apr 15 19:41:35 2024 +0000
tree c75ff8a55af7ac0c3d2a5bc0537465fcc1bc8dcd
parent d2b3a2051179b265d0817d9e027101a85a91d4fe

[nir] GN build: remove magma_python_path

It's not necessary because mako is specified as a library,
and we want to get rid of magma_python_path.

Change-Id: Id576c5ab336aca9328345790b1e56ae07022ca89
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/mesa/+/1012107
Reviewed-by: John Bauman <jbauman@google.com>
Commit-Queue: Craig Stout <cstout@google.com>

mesa.gni

diff --git a/mesa.gni b/mesa.gni
index fefef06..e6948d0 100644
--- a/mesa.gni
+++ b/mesa.gni
@@ -114,6 +114,11 @@
            "${py_binary_target} should only have one output")
     py_binary = py_binary[0]
     sources = [ py_binary ]
+    if (defined(invoker.sources)) {
+      # invoker.sources needed here for scripts that import at runtime
+      # (eg brw_nir_trig_workarounds.py)
+      sources += invoker.sources
+    }
 
     # Ensure scripts can import other scripts in the same directory
     # Note - I'm not sure why the ../ is necessary.

src/intel/compiler/BUILD.gn

diff --git a/src/intel/compiler/BUILD.gn b/src/intel/compiler/BUILD.gn
index 2b84504..def1ade 100644
--- a/src/intel/compiler/BUILD.gn
+++ b/src/intel/compiler/BUILD.gn
@@ -183,6 +183,6 @@
   libraries = [ "//third_party/mako" ]
   args = [
     "--import-path",
-    "$magma_python_path:" + rebase_path("$mesa_build_root/src/compiler/nir"),
+    rebase_path("$mesa_build_root/src/compiler/nir"),
   ]
 }