Always apply Python unixcompilers.py rpath fix, not just on cray (s…

…pack#39929) * Rename var/spack/repos/builtin/packages/python/cray-rpath-3.1.patch as var/spack/repos/builtin/packages/python/rpath-non-gcc.patch and apply unconditionally * Update var/spack/repos/builtin/packages/python/package.py Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com> --------- Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
AdhocMan · Oct 9, 2023 · 1796a02 · 1796a02
1 parent cc21a80
commit 1796a02
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py
@@ -282,8 +282,8 @@ class Python(Package):
     patch("tkinter-3.10.patch", when="@3.10.0:3.10 ~tkinter")
     patch("tkinter-3.11.patch", when="@3.11.0:3.11 ~tkinter")
 
-    # Ensure that distutils chooses correct compiler option for RPATH on cray:
-    patch("cray-rpath-3.1.patch", when="@3 platform=cray")
+    # Ensure that distutils chooses correct compiler option for RPATH:
+    patch("rpath-non-gcc.patch", when="@:3.11")
 
     # Ensure that distutils chooses correct compiler option for RPATH on fj:
     patch("fj-rpath-3.1.patch", when="@:3.9.7,3.10.0 %fj")

diff --git a/...ltin/packages/python/cray-rpath-3.1.patch → ...iltin/packages/python/rpath-non-gcc.patch b/...ltin/packages/python/cray-rpath-3.1.patch → ...iltin/packages/python/rpath-non-gcc.patch