-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix lld-targets + build Ubuntu 18.04/20.04 (#8)
* update lld-targets * try adding distros * fix yaml * update patch * update yaml * update * update yaml * update YAML * update yaml again * split 18.04/20.04 * try fixing ubuntu conditional * try updating cctools * update cctools * update cctools * add initial msvc-bundle workflow * update stuff * fix wget * add linux distro-specific initial cache files * add xcode-bundle Co-authored-by: Marc-André Moreau <[email protected]>
- Loading branch information
1 parent
61830ce
commit 6a67104
Showing
11 changed files
with
202 additions
and
52 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| name: msvc bundle | ||
| on: workflow_dispatch | ||
| jobs: | ||
| build: | ||
| name: MSVC bundle | ||
| runs-on: windows-2019 | ||
| steps: | ||
| - name: Configure Windows runner | ||
| run: | | ||
| choco install 7zip | ||
| - name: Enable Windows target environment | ||
| uses: ilammy/msvc-dev-cmd@v1 | ||
| with: | ||
| arch: amd64 | ||
|
|
||
| - name: Copy MSVC bundle | ||
| shell: pwsh | ||
| run: | | ||
| $BundlePath = $Env:GITHUB_WORKSPACE | ||
| Copy-Item -Recurse -Path $Env:VCToolsInstallDir\include -Destination $BundlePath\vctools\include | ||
| Copy-Item -Recurse -Path $Env:VCToolsInstallDir\lib -Destination $BundlePath\vctools\lib | ||
| Copy-Item -Recurse -Path $Env:WindowsSdkDir\Include\$Env:WindowsSDKVersion\ $BundlePath\winsdk\Include\$Env:WindowsSDKVersion | ||
| Copy-Item -Recurse -Path $Env:WindowsSdkDir\Lib\$Env:WindowsSDKVersion\ $BundlePath\winsdk\Lib\$Env:WindowsSDKVersion | ||
| - name: Package MSVC bundle | ||
| shell: pwsh | ||
| run: | | ||
| cmd.exe /c "7z a -ttar -snl -so vctools.tar vctools | 7z a -si vctools.tar.xz" | ||
| cmd.exe /c "7z a -ttar -snl -so winsdk.tar winsdk | 7z a -si winsdk.tar.xz" | ||
| - name: Upload vctools package | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: vctools | ||
| path: vctools.tar.xz | ||
|
|
||
| - name: Upload winsdk package | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: winsdk | ||
| path: winsdk.tar.xz |
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 |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| name: xcode bundle | ||
| on: workflow_dispatch | ||
| jobs: | ||
| build: | ||
| name: Xcode bundle | ||
| runs-on: macos-10.15 | ||
| steps: | ||
| - name: Configure macOS runner | ||
| run: | | ||
| brew install --cask powershell | ||
| - name: Copy Xcode bundle | ||
| shell: pwsh | ||
| run: | | ||
| $XcodeDeveloperPath = $(xcode-select -p) | ||
| $XcodePlatformsPath = Join-Path $XcodeDeveloperPath "Platforms" | ||
| $BundlePath = Join-Path $Env:GITHUB_WORKSPACE "xcode-bundle" | ||
| New-Item -Path $BundlePath -ItemType Directory | Out-Null | ||
| foreach ($Platform in @('MacOSX','iPhoneOS','iPhoneSimulator')) { | ||
| Write-Host "Copying $Platform SDK" | ||
| $PlatformPath = Join-Path $XcodePlatformsPath "$Platform.platform" | ||
| $PlatformSdkPath = Join-Path $PlatformPath "Developer" "SDKs" "$Platform.sdk" | ||
| Copy-Item -Recurse -Path $PlatformSdkPath -Destination $BundlePath | ||
| } | ||
| Write-Host "Copying Xcode xctoolchain" | ||
| $XcodeToolchainsPath = Join-Path $XcodeDeveloperPath "Toolchains" | ||
| $XcodeToolchainPath = Join-Path $XcodeToolchainsPath "XcodeDefault.xctoolchain" | ||
| $DestinationPath = Join-Path $BundlePath "XcodeDefault.xctoolchain" | ||
| New-Item -Path $DestinationPath -ItemType Directory | Out-Null | ||
| Copy-Item -Recurse -Path "$XcodeToolchainPath\usr\include" -Destination "$DestinationPath\usr\include" | ||
| Copy-Item -Recurse -Path "$XcodeToolchainPath\usr\lib" -Destination "$DestinationPath\usr\lib" | ||
| - name: Package Xcode bundle | ||
| shell: pwsh | ||
| run: | | ||
| tar -cJf xcode-bundle.tar.xz xcode-bundle | ||
| - name: Upload xcode-bundle package | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: xcode-bundle | ||
| path: xcode-bundle.tar.xz |
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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| include("${CMAKE_CURRENT_LIST_DIR}/aarch64-linux.cmake") |
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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| include("${CMAKE_CURRENT_LIST_DIR}/aarch64-linux.cmake") |
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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| include("${CMAKE_CURRENT_LIST_DIR}/x86_64-linux.cmake") |
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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| include("${CMAKE_CURRENT_LIST_DIR}/x86_64-linux.cmake") |
This file was deleted.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| From 2b6f6d9199b1a7ce9e9034df3909cddd8bcde6d0 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <[email protected]> | ||
| Date: Wed, 8 Sep 2021 08:49:13 -0400 | ||
| Subject: [PATCH] add lld install targets | ||
|
|
||
| --- | ||
| lld/CMakeLists.txt | 32 ++++++++++++++++++++++++++++++++ | ||
| lld/cmake/modules/AddLLD.cmake | 2 +- | ||
| 2 files changed, 33 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt | ||
| index 2e99564f4..5bb3d9ec0 100644 | ||
| --- a/lld/CMakeLists.txt | ||
| +++ b/lld/CMakeLists.txt | ||
| @@ -189,9 +189,19 @@ include_directories(BEFORE | ||
| if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) | ||
| install(DIRECTORY include/ | ||
| DESTINATION include | ||
| + COMPONENT lld-headers | ||
| FILES_MATCHING | ||
| PATTERN "*.h" | ||
| ) | ||
| + | ||
| + add_custom_target(lld-headers) | ||
| + set_target_properties(lld-headers PROPERTIES FOLDER "Misc") | ||
| + | ||
| + if(NOT LLVM_ENABLE_IDE) | ||
| + add_llvm_install_targets(install-lld-headers | ||
| + DEPENDS lld-headers | ||
| + COMPONENT lld-headers) | ||
| + endif() | ||
| endif() | ||
|
|
||
| add_subdirectory(Common) | ||
| @@ -210,4 +220,26 @@ add_subdirectory(MachO) | ||
| add_subdirectory(MinGW) | ||
| add_subdirectory(wasm) | ||
|
|
||
| +# Custom target to install all lld libraries. | ||
| +add_custom_target(lld-libraries) | ||
| +set_target_properties(lld-libraries PROPERTIES FOLDER "Misc") | ||
| + | ||
| +if(NOT LLVM_ENABLE_IDE) | ||
| + add_llvm_install_targets(install-lld-libraries | ||
| + DEPENDS lld-libraries | ||
| + COMPONENT lld-libraries) | ||
| +endif() | ||
| + | ||
| +get_property(LLD_EXPORTS GLOBAL PROPERTY LLD_EXPORTS) | ||
| +if(LLD_EXPORTS) | ||
| + list(REMOVE_DUPLICATES LLD_EXPORTS) | ||
| + foreach(lib ${LLD_EXPORTS}) | ||
| + add_dependencies(lld-libraries ${lib}) | ||
| + if(NOT LLVM_ENABLE_IDE) | ||
| + add_dependencies(install-lld-libraries install-${lib}) | ||
| + add_dependencies(install-lld-libraries-stripped install-${lib}-stripped) | ||
| + endif() | ||
| + endforeach() | ||
| +endif() | ||
| + | ||
| add_subdirectory(cmake/modules) | ||
| diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake | ||
| index 9883475d1..b2f597191 100644 | ||
| --- a/lld/cmake/modules/AddLLD.cmake | ||
| +++ b/lld/cmake/modules/AddLLD.cmake | ||
| @@ -21,7 +21,7 @@ macro(add_lld_library name) | ||
| ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} | ||
| RUNTIME DESTINATION bin) | ||
|
|
||
| - if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) | ||
| + if (NOT CMAKE_CONFIGURATION_TYPES) | ||
| add_llvm_install_targets(install-${name} | ||
| DEPENDS ${name} | ||
| COMPONENT ${name}) | ||
| -- | ||
| 2.25.1 | ||
|
|