Skip to content

Remove bash dependency from init-compiler #77304

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.

Sign up for GitHub

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
akoeplinger merged 12 commits into from
Dec 21, 2022
Merged

Remove bash dependency from init-compiler #77304

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
26f9fb1
Remove bash dependency from init-compiler
am11 Oct 21, 2022
0d8d146
Remove dependency on pipeline-logging-functions.sh
am11 Oct 21, 2022
30b703d
Remove hard-coded compiler versions from build
am11 Oct 25, 2022
3396707
Improve objcopy conditions
am11 Oct 25, 2022
78769a8
Merge dotnet/main into feature/shell-scripts
am11 Oct 25, 2022
210507b
Merge branch 'main' into feature/shell-scripts
am11 Dec 20, 2022
9049613
Update property name after merge-from-main
am11 Dec 20, 2022
68ab523
Use preferred property
am11 Dec 20, 2022
6a566f0
Feedback
am11 Dec 20, 2022
373ed2c
Update eng/testing/tests.singlefile.targets
am11 Dec 20, 2022
7163c3e
Fix condition
am11 Dec 20, 2022
ebaf445
Print stderr
am11 Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve objcopy conditions
  • Loading branch information
@am11
am11 committed Oct 25, 2022
commit 3396707523a17e4923b941eb0287ec40d8c4a347
6 changes: 3 additions & 3 deletions src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,10 @@ The .NET Foundation licenses this file to you under the MIT license.
</PropertyGroup>

<PropertyGroup Condition="'$(ObjCopyName)' == '' and '$(TargetOS)' != 'OSX'">
<ObjCopyName Condition="'$(CppCompilerAndLinker)' != 'clang'">objcopy</ObjCopyName>
<ObjCopyName Condition="'$(CppCompilerAndLinker)' == 'clang'">llvm-objcopy</ObjCopyName>
<ObjCopyName Condition="!$(CppCompilerAndLinker.Contains('clang'))">objcopy</ObjCopyName>
<ObjCopyName Condition="$(CppCompilerAndLinker.Contains('clang'))">llvm-objcopy</ObjCopyName>
<ObjCopyNameAlternative />
<ObjCopyNameAlternative Condition="'$(CppCompilerAndLinker)' == 'clang'">objcopy</ObjCopyNameAlternative>
<ObjCopyNameAlternative Condition="$(CppCompilerAndLinker.Contains('clang'))">objcopy</ObjCopyNameAlternative>
</PropertyGroup>

<Error Condition="'$(_WhereLinker)' != '0' and '$(TargetOS)' == 'OSX'" Text="Platform linker ('$(CppLinker)') not found in PATH. Try installing Xcode to resolve the problem." />
Expand Down