Merge pull request #2089 from swiftwasm/katei/default-sdk-as-wasi-sysroot

MaxDesiatov · web-flow · commit 92d4b500a9d2 · 2020-10-24T18:32:09.000+01:00
Set default sdk value as wasi-sysroot when targeting WASI OS
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
@@ -1754,6 +1754,13 @@ void Driver::buildOutputInfo(const ToolChain &TC, const DerivedArgList &Args,
           });
         }
       }
+    } if (OI.SDKPath.empty() && TC.getTriple().isOSWASI()) {
+        llvm::SmallString<128> SDKPath;
+        llvm::sys::path::append(SDKPath, getSwiftProgramPath());
+        llvm::sys::path::remove_filename(SDKPath); // 'swift'
+        llvm::sys::path::remove_filename(SDKPath); // 'bin'
+        llvm::sys::path::append(SDKPath, "share", "wasi-sysroot");
+        OI.SDKPath = SDKPath.str().str();
     }
 
     if (!OI.SDKPath.empty()) {

Original file line number	Diff line number	Diff line change
`@@ -1754,6 +1754,13 @@ void Driver::buildOutputInfo(const ToolChain &TC, const DerivedArgList &Args,`
`1754`	`1754`	`});`
`1755`	`1755`	`}`
`1756`	`1756`	`}`
	`1757`	`+ } if (OI.SDKPath.empty() && TC.getTriple().isOSWASI()) {`
	`1758`	`+ llvm::SmallString<128> SDKPath;`
	`1759`	`+ llvm::sys::path::append(SDKPath, getSwiftProgramPath());`
	`1760`	`+ llvm::sys::path::remove_filename(SDKPath); // 'swift'`
	`1761`	`+ llvm::sys::path::remove_filename(SDKPath); // 'bin'`
	`1762`	`+ llvm::sys::path::append(SDKPath, "share", "wasi-sysroot");`
	`1763`	`+ OI.SDKPath = SDKPath.str().str();`
`1757`	`1764`	`}`
`1758`	`1765`
`1759`	`1766`	`if (!OI.SDKPath.empty()) {`