DAOS-14216 build: Build fail if home is under /usr (daos-stack#12907)

The DAOS build will fail if a user builds prerequisites under /usr such as when the home directory is nested within. This patch simply changes the check for whether to patch rpath to continue if prereq is in the path for the binary in question. Signed-off-by: Jeff Olivier <[email protected]>
paul356 · Aug 23, 2023 · 0d8c1fa · 0d8c1fa
1 parent 758e526
commit 0d8c1fa
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/site_scons/prereq_tools/base.py b/site_scons/prereq_tools/base.py
@@ -1334,7 +1334,9 @@ def _patch_rpaths(self):
         rpath = ["$$ORIGIN"]
         norigin = []
         comp_path = self.component_prefix
-        if not comp_path or comp_path.startswith("/usr"):
+        if not comp_path:
+            return
+        if comp_path.startswith('/usr') and '/prereq/' not in comp_path:
             return
         if not os.path.exists(comp_path):
             return