-
Notifications
You must be signed in to change notification settings - Fork 4.5k
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
Add ability statically link OpenSSL #80380
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
cd9d7bc
Add ability statically link OpenSSL
kant2002 8d3958d
Add missing file
kant2002 d57e14c
Share build scripts across Globalization and OpenSSL
kant2002 451f075
Change commennt
kant2002 3973f11
Restore formatting
kant2002 387e375
Update src/native/libs/build-local.sh
kant2002 96c61b9
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
kant2002 2766c1c
Add warning
kant2002 e0c3af5
Add warning
kant2002 973e7a3
Restore X bit
kant2002 c7dbd20
Update src/native/libs/build-local.sh
kant2002 File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,24 +4,25 @@ | |
# The .NET Foundation licenses this file to you under the MIT license. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Executable bit was dropped during the move: There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thank you. |
||
# | ||
|
||
# This script is used only for building libSystem.Globalization.Native.a | ||
# This script is used only for building native libraries | ||
# in the end-user's computer for NativeAOT purposes (static linking). | ||
# This file is not used during the dotnet runtime build. | ||
|
||
# Currently, only Linux is supported | ||
|
||
SHIM_SOURCE_DIR="$1"/native/src | ||
INTERMEDIATE_OUTPUT_PATH="$2" | ||
TARGET_LIBRARY="$3" | ||
|
||
if [ -d "$SHIM_SOURCE_DIR" ]; then | ||
LOCAL_SHIM_DIR="$INTERMEDIATE_OUTPUT_PATH"/libs/System.Globalization.Native/build | ||
LOCAL_SHIM_DIR="$INTERMEDIATE_OUTPUT_PATH"/libs/$TARGET_LIBRARY/build | ||
|
||
if ! { mkdir -p "$LOCAL_SHIM_DIR" && cd "$LOCAL_SHIM_DIR"; }; then | ||
echo "local_build.sh::ERROR: Cannot use local build directory" | ||
exit 1 | ||
fi | ||
|
||
if ! cmake -S "$SHIM_SOURCE_DIR/libs/System.Globalization.Native/" -DLOCAL_BUILD:STRING=1 -DCLR_CMAKE_TARGET_UNIX:STRING=1; then | ||
if ! cmake -S "$SHIM_SOURCE_DIR/libs/$TARGET_LIBRARY/" -DLOCAL_BUILD:STRING=1 -DCLR_CMAKE_TARGET_UNIX:STRING=1; then | ||
echo "local_build.sh::ERROR: cmake failed" | ||
exit 1 | ||
fi | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@blowdart Does this look good?