Skip to content

Update LLVMLibCArchitectures.cmake #112464

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

Merged
merged 1 commit into from
Oct 16, 2024
Merged

Update LLVMLibCArchitectures.cmake #112464

merged 1 commit into from
Oct 16, 2024

Conversation

westtide
Copy link
Contributor

Hi there,

When building llvm-libc on the openEuler system, I encountered an issue as shown in the image below:
image

This issue happens because the regular expression used in libc/cmake/modules/LLVMLibCArchitectures.cmake: string(REGEX MATCH "Target: [-_a-z0-9.]+[ \r\n]+") does not handle capital letters properly in openEuler.

To fix this, I modified the regular expression to: string(REGEX MATCH "Target: [-_a-zA-Z0-9.]+[ \r\n]+"). This change makes it compatible with capital letters.

Fix the matching failure of triples containing uppercase latter, such as 'openEuler'
Copy link

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

@llvmbot llvmbot added the libc label Oct 16, 2024
@llvmbot
Copy link
Member

llvmbot commented Oct 16, 2024

@llvm/pr-subscribers-libc

Author: westtide (westtide)

Changes

Hi there,

When building llvm-libc on the openEuler system, I encountered an issue as shown in the image below:
image

This issue happens because the regular expression used in libc/cmake/modules/LLVMLibCArchitectures.cmake: string(REGEX MATCH "Target: [-_a-z0-9.]+[ \r\n]+") does not handle capital letters properly in openEuler.

To fix this, I modified the regular expression to: string(REGEX MATCH "Target: [-_a-zA-Z0-9.]+[ \r\n]+"). This change makes it compatible with capital letters.


Full diff: https://github.com/llvm/llvm-project/pull/112464.diff

1 Files Affected:

  • (modified) libc/cmake/modules/LLVMLibCArchitectures.cmake (+1-1)
diff --git a/libc/cmake/modules/LLVMLibCArchitectures.cmake b/libc/cmake/modules/LLVMLibCArchitectures.cmake
index 7711127c1a81e1..1e5ed723194a26 100644
--- a/libc/cmake/modules/LLVMLibCArchitectures.cmake
+++ b/libc/cmake/modules/LLVMLibCArchitectures.cmake
@@ -84,7 +84,7 @@ if(NOT (libc_compiler_info_result EQUAL "0"))
   message(FATAL_ERROR "libc build: error querying compiler info from the "
                       "compiler: ${libc_compiler_info}")
 endif()
-string(REGEX MATCH "Target: [-_a-z0-9.]+[ \r\n]+"
+string(REGEX MATCH "Target: [-_a-zA-Z0-9.]+[ \r\n]+"
        libc_compiler_target_info ${libc_compiler_info})
 if(NOT libc_compiler_target_info)
   message(FATAL_ERROR "libc build: could not read compiler target info from:\n"

@jhuber6 jhuber6 merged commit 4cc6a08 into llvm:main Oct 16, 2024
9 checks passed
Copy link

@westtide Congratulations on having your first Pull Request (PR) merged into the LLVM Project!

Your changes will be combined with recent changes from other authors, then tested by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR.

Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues.

How to do this, and the rest of the post-merge process, is covered in detail here.

If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again.

If you don't get any reports, no action is required from you. Your changes are working as expected, well done!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants