Remove rebase conflict

Chrismarsh · Chrismarsh · commit c4dd67b7a54e · 2024-09-04T17:13:42.000-06:00
diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py
@@ -333,12 +333,12 @@ def bootstrap_args(self):
         )
 
         # Make CMake find its own dependencies.
-        rpaths = spack.build_environment.get_rpaths(self)
+        # rpaths = spack.build_environment.get_rpaths(self)
         prefixes = spack.build_environment.get_cmake_prefix_path(self)
         args.extend(
             [
                 "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON",
-                "-DCMAKE_INSTALL_RPATH={0}".format(";".join(str(v) for v in rpaths)),
+                # "-DCMAKE_INSTALL_RPATH={0}".format(";".join(str(v) for v in rpaths)),
                 "-DCMAKE_PREFIX_PATH={0}".format(";".join(str(v) for v in prefixes)),
             ]
         )

Original file line number	Diff line number	Diff line change
`@@ -333,12 +333,12 @@ def bootstrap_args(self):`
`333`	`333`	`)`
`334`	`334`
`335`	`335`	`# Make CMake find its own dependencies.`
`336`		`- rpaths = spack.build_environment.get_rpaths(self)`
	`336`	`+ # rpaths = spack.build_environment.get_rpaths(self)`
`337`	`337`	`prefixes = spack.build_environment.get_cmake_prefix_path(self)`
`338`	`338`	`args.extend(`
`339`	`339`	`[`
`340`	`340`	`"-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON",`
`341`		`- "-DCMAKE_INSTALL_RPATH={0}".format(";".join(str(v) for v in rpaths)),`
	`341`	`+ # "-DCMAKE_INSTALL_RPATH={0}".format(";".join(str(v) for v in rpaths)),`
`342`	`342`	`"-DCMAKE_PREFIX_PATH={0}".format(";".join(str(v) for v in prefixes)),`
`343`	`343`	`]`
`344`	`344`	`)`