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

MaxDesiatov · web-flow · commit 6d113b8ee1dd · 2020-10-25T19:14:57.000Z
Set default sdk value as wasi-sysroot when targeting WASI OS for 5.3
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
@@ -1728,6 +1728,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
`@@ -1728,6 +1728,13 @@ void Driver::buildOutputInfo(const ToolChain &TC, const DerivedArgList &Args,`
`1728`	`1728`	`});`
`1729`	`1729`	`}`
`1730`	`1730`	`}`
	`1731`	`+ } if (OI.SDKPath.empty() && TC.getTriple().isOSWASI()) {`
	`1732`	`+ llvm::SmallString<128> SDKPath;`
	`1733`	`+ llvm::sys::path::append(SDKPath, getSwiftProgramPath());`
	`1734`	`+ llvm::sys::path::remove_filename(SDKPath); // 'swift'`
	`1735`	`+ llvm::sys::path::remove_filename(SDKPath); // 'bin'`
	`1736`	`+ llvm::sys::path::append(SDKPath, "share", "wasi-sysroot");`
	`1737`	`+ OI.SDKPath = SDKPath.str().str();`
`1731`	`1738`	`}`
`1732`	`1739`
`1733`	`1740`	`if (!OI.SDKPath.empty()) {`