| commit | d45cca1dc16cb00ea3c8447df9b154354eb80629 | [log] [tgz] |
|---|---|---|
| author | jopamer <joe@noteven.org> | Sat Feb 06 21:50:52 2016 -0800 |
| committer | jopamer <joe@noteven.org> | Sat Feb 06 21:50:52 2016 -0800 |
| tree | 8b38e5dadc000f4f92a929c7e13b0186b307ed65 | |
| parent | b59a23b319391ba1108177d63dfc6e1b37400454 [diff] | |
| parent | 37f6b57c85e9d687836163f4270753fb89d29e62 [diff] |
Merge pull request #1225 from apple/fix-compiler-version-build [Swift 2.2] Extract Version value out of optional when parsing _compiler_version
diff --git a/lib/Basic/Version.cpp b/lib/Basic/Version.cpp index f7f9b7a..22240c6 100644 --- a/lib/Basic/Version.cpp +++ b/lib/Basic/Version.cpp
@@ -241,7 +241,7 @@ "Embedded Swift language version couldn't be parsed: '" SWIFT_COMPILER_VERSION "'"); - return currentVersion; + return currentVersion.getValue(); #else return Version(); #endif