Skip to content

Update vcpkg and LLVM #1015

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
merged 14 commits into from
Apr 22, 2023
Merged

Update vcpkg and LLVM #1015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
184e3c9
Update to latest vcpkg and LLVM
ekilmer Apr 19, 2023
fe539b5
Test remill with LLVM 16
ekilmer Apr 19, 2023
56cf325
Add new pasta patch
ekilmer Apr 19, 2023
0f31f41
Revert "Test remill with LLVM 16"
ekilmer Apr 19, 2023
2278d17
Updated pasta patches for asan
Apr 20, 2023
f18138b
LLVM 16: Fix ASAN compilation
ekilmer Apr 20, 2023
880b244
Adjust ASAN triplets
ekilmer Apr 20, 2023
d9a0f07
Update 0025-PASTA-patches.patch
Apr 20, 2023
04a49c7
Update 0028-Fixes-to-clang-s-tablegen-of-attributes.patch
Apr 20, 2023
c592630
Update 0028-Fixes-to-clang-s-tablegen-of-attributes.patch
Apr 20, 2023
eaa7100
Use latest clang on macOS CI [debug artifacts]
ekilmer Apr 20, 2023
c9c0e36
Update 0025-PASTA-patches.patch
Apr 20, 2023
bd95816
debug artifacts
ekilmer Apr 20, 2023
b71b7df
Patch vcpkg and fix crosscompilation
ekilmer Apr 21, 2023
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
5 changes: 5 additions & 0 deletions .github/workflows/vcpkg_ci_mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ jobs:
echo "Selecting XCode Version ${{ matrix.os.xcode }}"
sudo xcode-select -s /Applications/Xcode_${{ matrix.os.xcode }}.app/Contents/Developer

- name: Install latest LLVM
run: |
brew install llvm
echo "/usr/local/opt/llvm/bin" >> "$GITHUB_PATH"

- name: Initialize vcpkg
shell: bash
run: |
Expand Down
22 changes: 14 additions & 8 deletions build_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ if [[ -z "${CC+unset}" || -z "${CC}" ]]; then
export CC="${CC:-$(which clang)}"
msg "Using default clang as CC=${CC}"
else
msg "Using default C comiler"
msg "Using default C compiler"
fi
else
msg "Using custom CC=${CC}"
Expand Down Expand Up @@ -179,11 +179,11 @@ if [[ ${ASAN} == "true" ]]; then
fi

repo_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
vcpkg_dir="${repo_dir:?}/vcpkg"
vcpkg_dir=${repo_dir:?}/vcpkg

if [[ -z ${EXPORT_DIR} ]]; then
# Set default export directory variable. Used for printing end message
EXPORT_DIR="${vcpkg_dir}"
EXPORT_DIR=${vcpkg_dir}
fi

extra_vcpkg_args+=("--triplet=${target_triplet}" "--host-triplet=${host_triplet}" "--x-install-root=${EXPORT_DIR}/installed")
Expand Down Expand Up @@ -248,6 +248,11 @@ msg "Building dependencies"
msg "Passing extra args to 'vcpkg install':"
msg " " "${VCPKG_ARGS[@]}"

overlays=()
if [ -f "${repo_dir}/overlays.txt" ] ; then
readarray -t overlays < <(cat "${repo_dir}/overlays.txt")
fi

# Check if we should upgrade ports
if [[ ${UPGRADE_PORTS} == "true" ]]; then
echo ""
Expand All @@ -256,14 +261,15 @@ if [[ ${UPGRADE_PORTS} == "true" ]]; then
cd "${repo_dir}"
(
set -x
"${vcpkg_dir}/vcpkg" upgrade "${extra_vcpkg_args[@]}" '@overlays.txt' --no-dry-run --allow-unsupported
# shellcheck disable=SC2046
"${vcpkg_dir}/vcpkg" upgrade "${extra_vcpkg_args[@]}" "${overlays[@]}" --no-dry-run --allow-unsupported
)
) || exit 1
fi

dep_file='@dependencies.txt'
if [ ! -f "${repo_dir}/dependencies.txt" ] ; then
dep_file=''
deps=()
if [ -f "${repo_dir}/dependencies.txt" ] ; then
readarray -t deps < <(cat "${repo_dir}/dependencies.txt")
fi

# Run the vcpkg installation of our packages
Expand All @@ -272,7 +278,7 @@ fi
(
set -x

"${vcpkg_dir}/vcpkg" install "${extra_vcpkg_args[@]}" '@overlays.txt' "${dep_file}" "${VCPKG_ARGS[@]}"
"${vcpkg_dir}/vcpkg" install "${extra_vcpkg_args[@]}" "${overlays[@]}" "${deps[@]}" "${VCPKG_ARGS[@]}"
)
) || exit 1

Expand Down
1 change: 1 addition & 0 deletions ports/llvm-15/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"compiler-rt",
"cxx-common-targets",
"default-options",
"lld",
"mlir",
"tools",
"utils"
Expand Down
Loading