Skip to content

Move more Standard Library options to dedicated file #40723

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

Conversation

edymtt
Copy link
Contributor

@edymtt edymtt commented Jan 3, 2022

This addresses most of the options with computed defaults.

Addresses rdar://86723940

This addresses most of the options with computed defaults.

Addresses rdar://86723940
@edymtt
Copy link
Contributor Author

edymtt commented Jan 3, 2022

@swift-ci please smoke test

@edymtt
Copy link
Contributor Author

edymtt commented Jan 3, 2022

@swift-ci please test Apple Silicon

@edymtt
Copy link
Contributor Author

edymtt commented Jan 3, 2022

@swift-ci please build toolchain

@edymtt
Copy link
Contributor Author

edymtt commented Jan 3, 2022

preset=stdlib_S_standalone_minimal_macho_x86_64,build,test
@swift-ci please test with toolchain and preset

@edymtt
Copy link
Contributor Author

edymtt commented Jan 3, 2022

@swift-ci Please ASAN test

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

This movement is fine, but it does make me wish for the names being more consistent internally. That is not your fault, and definitely beyond the scope of this change, but if you so feel inclined (as a separate change) ... ;-).

Also, thank you for taking the time to move the default value computation next to the option, I think that it makes this so much easier for longer term maintenance.

@edymtt
Copy link
Contributor Author

edymtt commented Jan 3, 2022

@swift-ci please smoke test

@edymtt
Copy link
Contributor Author

edymtt commented Jan 3, 2022

@swift-ci please test Apple Silicon

@edymtt
Copy link
Contributor Author

edymtt commented Jan 3, 2022

@swift-ci please build toolchain

@edymtt
Copy link
Contributor Author

edymtt commented Jan 3, 2022

preset=stdlib_S_standalone_minimal_macho_x86_64,build,test
@swift-ci please test with toolchain and preset

@edymtt
Copy link
Contributor Author

edymtt commented Jan 3, 2022

stdlib_S_standalone_minimal_macho_x86_64,build,test passed -- https://ci.swift.org/job/swift-PR-stdlib-with-toolchain-osx-preset/100/

@edymtt
Copy link
Contributor Author

edymtt commented Jan 3, 2022

preset=stdlib_S_standalone_darwin_x86_64,build,test
@swift-ci please test with toolchain and preset

@edymtt
Copy link
Contributor Author

edymtt commented Jan 3, 2022

@swift-ci please test Windows

@compnerd
Copy link
Member

compnerd commented Jan 4, 2022

@swift-ci please test Windows platform

@edymtt
Copy link
Contributor Author

edymtt commented Jan 4, 2022

The Windows failure seems unrelated to this changes, since it's happening in the incremental bot as well -- e.g. https://ci-external.swift.org/job/oss-swift-windows-x86_64-vs2019/7549/

[950/958] Linking CXX executable bin\lldb-server.exe
FAILED: bin/lldb-server.exe 
cmd.exe /C "cd . && "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -E vs_link_exe --intdir=tools\lldb-server\CMakeFiles\lldb-server.dir --rc=C:\PROGRA~2\WI3CF2~1\10\bin\100177~1.0\x64\rc.exe --mt=C:\PROGRA~2\WI3CF2~1\10\bin\100177~1.0\x64\mt.exe --manifests  -- C:\PROGRA~2\MICROS~1\2019\COMMUN~1\VC\Tools\MSVC\1429~1.300\bin\Hostx64\x64\link.exe /nologo @CMakeFiles\lldb-server.rsp  /out:bin\lldb-server.exe /implib:lib\lldb-server.lib /pdb:bin\lldb-server.pdb /version:0.0 /INCREMENTAL:NO /STACK:10000000 /INCREMENTAL:NO /subsystem:console  && cd ."
LINK: command "C:\PROGRA~2\MICROS~1\2019\COMMUN~1\VC\Tools\MSVC\1429~1.300\bin\Hostx64\x64\link.exe /nologo @CMakeFiles\lldb-server.rsp /out:bin\lldb-server.exe /implib:lib\lldb-server.lib /pdb:bin\lldb-server.pdb /version:0.0 /INCREMENTAL:NO /STACK:10000000 /INCREMENTAL:NO /subsystem:console /MANIFEST /MANIFESTFILE:bin\lldb-server.exe.manifest" failed (exit code 1181) with the following output:
LINK : fatal error LNK1181: cannot open input file 'swiftCompilerModules.lib'

EDIT: spoke too soon, this does not happen in the newest run after swiftlang/llvm-project#3737 got merged.

@edymtt
Copy link
Contributor Author

edymtt commented Jan 4, 2022

Linux runs are hitting the same failure as e.g. https://ci.swift.org/view/Packages/job/oss-swift-package-linux-ubuntu-16_04/6820/console

18:05:11 RuntimeError: Found a load command that loads something executable and writeable
18:05:11 
18:05:11 error: command failed with exit status: 1
18:05:11 
18:05:11 --
18:05:11 
18:05:11 ********************
18:05:11 Testing:  0.. 10.. 20.. 30.. 40.. 50.. 60.. 70.. 80.. 90.. 
18:05:11 ********************
18:05:18 Failed Tests (1):
18:05:18   swift-package-tests :: test-snapshot-binaries/linux_load_commands.py

@edymtt
Copy link
Contributor Author

edymtt commented Jan 4, 2022

@swift-ci please build toolchain macOS

@edymtt
Copy link
Contributor Author

edymtt commented Jan 4, 2022

@swift-ci please test Linux

@edymtt
Copy link
Contributor Author

edymtt commented Jan 4, 2022

@swift-ci please build toolchain Linux platform

@swift-ci
Copy link
Contributor

swift-ci commented Jan 4, 2022

macOS Toolchain
Download Toolchain
Git Sha - 711d062

Install command
tar -zxf swift-PR-40723-1262-osx.tar.gz --directory ~/

@swift-ci
Copy link
Contributor

swift-ci commented Jan 5, 2022

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - 711d062

Install command
tar zxf swift-PR-40723-764-ubuntu16.04.tar.gz
More info

@edymtt
Copy link
Contributor Author

edymtt commented Jan 6, 2022

@compnerd for now I made a note about renaming, not sure if/when I will be able to get to that

@edymtt edymtt merged commit 127528a into swiftlang:main Jan 6, 2022
edymtt added a commit to edymtt/swift that referenced this pull request Jan 6, 2022
This was missed when working on swiftlang#40723 and will prevent
`SWIFT_STDLIB_HAS_ASL` having a wrong default.
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.

3 participants