Skip to content
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

Jump to bottom

[llvm] add features enable-{eh,ffi,bindings,terminfo,threads} #16877

Merged
merged 1 commit into from
Mar 29, 2021
+34 −4
Merged

[llvm] add features enable-{eh,ffi,bindings,terminfo,threads} #16877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 19 additions & 2 deletions ports/llvm/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Source: llvm
Version: 11.0.0
Port-Version: 1
Port-Version: 2
Homepage: https://llvm.org/
Description: The LLVM Compiler Infrastructure
Supports: !uwp
Default-Features: tools, enable-rtti, disable-assertions, disable-abi-breaking-checks, clang, disable-clang-static-analyzer, lld, default-targets
Default-Features: tools, enable-rtti, enable-threads, disable-assertions, disable-abi-breaking-checks, clang, disable-clang-static-analyzer, lld, default-targets, enable-terminfo, enable-bindings

Feature: tools
Description: Build LLVM tools.
Expand Down Expand Up @@ -71,15 +71,32 @@ Description: Build with X86 backend.
Feature: target-xcore
Description: Build with XCore backend.

Feature: enable-eh
abique marked this conversation as resolved.
Show resolved Hide resolved
Description: Build LLVM with exception handler.
Build-Depends: llvm[core,enable-rtti]

Feature: enable-rtti
Description: Build LLVM with run-time type information.

Feature: enable-ffi
Description: Build LLVM with FFI.
abique marked this conversation as resolved.
Show resolved Hide resolved
Build-Depends: libffi

Feature: enable-bindings
abique marked this conversation as resolved.
Show resolved Hide resolved
Description: Build bindings.

Feature: enable-assertions
Description: Build LLVM with assertions.

Feature: disable-assertions
Description: Build LLVM without assertions.

Feature: enable-terminfo
abique marked this conversation as resolved.
Show resolved Hide resolved
Description: Build LLVM with terminfo.

Feature: enable-threads
abique marked this conversation as resolved.
Show resolved Hide resolved
Description: Enable multi-threaded LTO.

Feature: enable-abi-breaking-checks
Description: Build LLVM with LLVM_ABI_BREAKING_CHECKS=FORCE_ON.

Expand Down
10 changes: 9 additions & 1 deletion ports/llvm/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,17 @@ vcpkg_from_github(
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
tools LLVM_BUILD_TOOLS
tools LLVM_INCLUDE_TOOLS
utils LLVM_BUILD_UTILS
utils LLVM_INCLUDE_UTILS
enable-rtti LLVM_ENABLE_RTTI
enable-ffi LLVM_ENABLE_FFI
enable-terminfo LLVM_ENABLE_TERMINFO
enable-threads LLVM_ENABLE_THREADS
enable-eh LLVM_ENABLE_EH
enable-bindings LLVM_ENABLE_BINDINGS
)

# LLVM generates CMake error due to Visual Studio version 16.4 is known to miscompile part of LLVM.
Expand Down Expand Up @@ -240,7 +246,9 @@ foreach(tool_file IN LISTS LLVM_TOOL_FILES)
endif()
endforeach()

vcpkg_copy_tools(TOOL_NAMES ${LLVM_TOOLS} AUTO_CLEAN)
if(LLVM_TOOLS)
abique marked this conversation as resolved.
Show resolved Hide resolved
vcpkg_copy_tools(TOOL_NAMES ${LLVM_TOOLS} AUTO_CLEAN)
endif()

if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3650,7 +3650,7 @@
},
"llvm": {
"baseline": "11.0.0",
"port-version": 1
"port-version": 2
},
"lmdb": {
"baseline": "0.9.24",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/llvm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "308632b643c39d4e6871c550156d218b4cf8d968",
"version-string": "11.0.0",
"port-version": 2
},
{
"git-tree": "9a8e86d3dc793c4404435e87c04470da6d9cccce",
"version-string": "11.0.0",
Expand Down