diff options
| author | Evan Wilde <etceterawilde@gmail.com> | 2022-10-26 23:11:51 (GMT) |
|---|---|---|
| committer | Evan Wilde <etceterawilde@gmail.com> | 2022-10-28 23:44:26 (GMT) |
| commit | e88509d0e87eaa6f41603bfd7b07b653527e88c0 (patch) | |
| tree | b7d43db0ee99bc1a1a7d79640d434725820d949c /Source/cmNinjaTargetGenerator.h | |
| parent | bcf203226a6877824b91f2ffa9b5cc0373900273 (diff) | |
| download | CMake-e88509d0e87eaa6f41603bfd7b07b653527e88c0.zip CMake-e88509d0e87eaa6f41603bfd7b07b653527e88c0.tar.gz CMake-e88509d0e87eaa6f41603bfd7b07b653527e88c0.tar.bz2 | |
Swift: Omit output-file-map when used as a linker
Swift is used as the linker for non-swift files because it needs to pull
files like swiftrt.o in when swift symbols are present to ensure that
the swift runtime is linked.
The swift driver uses clang as the underlying linker, which pulls in
crtbegin.o and friends when appropriate, so using Swift as a linker for
C/C++ libraries is fine.
The output-file-map was getting passed to all Swift invocations,
regardless of whether or not we generated one. This patch changes it so
that we only include the output-file-map in the Swift compiler
invocation if we have actually generated the file.
Diffstat (limited to 'Source/cmNinjaTargetGenerator.h')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h index 4b4cf8d..c43b650 100644 --- a/Source/cmNinjaTargetGenerator.h +++ b/Source/cmNinjaTargetGenerator.h @@ -163,6 +163,9 @@ protected: void EmitSwiftDependencyInfo(cmSourceFile const* source, const std::string& config); + void GenerateSwiftOutputFileMap(const std::string& config, + std::string& flags); + void ExportObjectCompileCommand( std::string const& language, std::string const& sourceFileName, std::string const& objectDir, std::string const& objectFileName, |