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.

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

clang: update to 18.1.6 #115

Merged
merged 3 commits into from
Jun 4, 2024
Merged

Conversation

rimrul
Copy link
Member

@rimrul rimrul commented Mar 27, 2024

MSYS2 renamed the directory. Move our files to a matching directory in
preparation for the update to version 18.1.6

Signed-off-by: Matthias Aßhauer <mha1993@live.de>
@rimrul rimrul changed the title clang: update to 18.1.2 clang: update to 18.1.6 May 28, 2024
@rimrul
Copy link
Member Author

rimrul commented Jun 1, 2024

Needs git-for-windows/gfw-helper-github-app#81 before we can /deploy this

@rimrul
Copy link
Member Author

rimrul commented Jun 3, 2024

/deploy

The workflow run was started.

We need to be careful not to replace any trailing space and backslash when
replacing the value of LLVM_TARGETS_TO_BUILD. MSYS2 also renamed the
directory, so pkgname needs to be adapted slightly.

Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Signed-off-by: Matthias Aßhauer <mha1993@live.de>
@@ -49,7 +49,8 @@ mv upstream/$pkgname/README-patches.md ./ || die "$0: failed to replace existing

sed -e "s/pkgrel=[.0-9]\+\(.*\)/pkgrel=$new_pkgrel\1/" \
-e 's/-DCMAKE_BUILD_TYPE=Release/-DCMAKE_BUILD_TYPE=MinSizeRel/' \
-e 's/-DLLVM_TARGETS_TO_BUILD=[^)]*/-DLLVM_TARGETS_TO_BUILD=Native/' \
-e 's/-DLLVM_TARGETS_TO_BUILD=[^)\\]*/-DLLVM_TARGETS_TO_BUILD=Native/' \
-e 's/-DLLVM_TARGETS_TO_BUILD=Native\\/-DLLVM_TARGETS_TO_BUILD=Native \\/' \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've thought about [^)\\ ] instead of removing and reintroducing a potential space, but decided against it to not have this break again due to a random space in a future target list.

@rimrul
Copy link
Member Author

rimrul commented Jun 3, 2024

/deploy

The workflow run was started.

@rimrul rimrul merged commit 0680efc into git-for-windows:main Jun 4, 2024
4 checks passed
@rimrul rimrul deleted the mingw-w64-clang-18.1.2 branch June 4, 2024 04:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[New mingw-w64-clang version] llvm: update to 18.1.2
1 participant