Add -rpath to installed lib dir. when NANOS6_HOME and CLANG_NANOS6_HOME are not defined

mikaoP · mikaoP · commit b92eba8c638d · 2019-06-27T09:43:55.000Z
diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -553,6 +553,10 @@ void tools::addOmpSsRuntime(ArgStringList &CmdArgs, const ToolChain &TC,
     CmdArgs.push_back("-rpath");
     CmdArgs.push_back(Args.MakeArgString(RuntimeDefaultHome + "/lib"));
   }
+  else {
+    CmdArgs.push_back("-rpath");
+    CmdArgs.push_back(Args.MakeArgString(std::string(TC.getDriver().getInstalledDir()) + "/../lib"));
+  }
   CmdArgs.push_back("-lnanos6");
 }
 

Original file line number	Diff line number	Diff line change
`@@ -553,6 +553,10 @@ void tools::addOmpSsRuntime(ArgStringList &CmdArgs, const ToolChain &TC,`
`553`	`553`	`CmdArgs.push_back("-rpath");`
`554`	`554`	`CmdArgs.push_back(Args.MakeArgString(RuntimeDefaultHome + "/lib"));`
`555`	`555`	`}`
	`556`	`+ else {`
	`557`	`+ CmdArgs.push_back("-rpath");`
	`558`	`+ CmdArgs.push_back(Args.MakeArgString(std::string(TC.getDriver().getInstalledDir()) + "/../lib"));`
	`559`	`+ }`
`556`	`560`	`CmdArgs.push_back("-lnanos6");`
`557`	`561`	`}`
`558`	`562`