Skip to content

[3.0]: [build-script-impl]: Fixes version number on Linux from 3.0 to 3.0.x #5513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

erg
Copy link
Contributor

@erg erg commented Oct 28, 2016

Linux reports 3.0 instead of 3.0.x.

Testing then asking to merge.

Brief:
COMPILER_VENDOR is None on Linux, so we get version 3.0 instead of 3.0.x.

Full:
On Linux, SWIFT_VERSION is unset because the ``None)`` case for ``COMPILER_VENDOR`` is empty.
When ``lib/Basic/CMakeLists.txt`` tries to match the empty ``SWIFT_VERSION`` against regexps
testing for a version triple, matching fails and we set ``DSWIFT_HAS_VERSION_PATCHLEVEL=0``.
Then, in ``lib/Basic/Version.cpp``, since PATCHLEVEL is 0, it chooses the ``#else``
and ``SWIFT_VERSION_STRING`` is set to a pair instead of a triple, which gives ``3.0``.
@erg
Copy link
Contributor Author

erg commented Oct 28, 2016

@swift-ci Please test

@swift-ci
Copy link
Contributor

Build failed
Jenkins build - Swift Test OS X Platform
Git Commit - 017e11f
Test requested by - @erg

@erg
Copy link
Contributor Author

erg commented Oct 28, 2016

@swift-ci Please test OS X platform

Copy link
Contributor

@jrose-apple jrose-apple left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still wondering what the underlying issue is (i.e. how did it know it was even Swift 3.0 without this), but if this fixes the 3.0.1 branch it seems reasonable.

@ematejska ematejska merged commit a1e4680 into swiftlang:swift-3.0-branch Oct 28, 2016
MaxDesiatov pushed a commit that referenced this pull request Sep 7, 2023
[wasm] Revert unnecessary CC attr in Numeric.cpp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants