Skip to content

[libc] Fix setjmp build order. #144917

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
Jun 19, 2025
Merged

[libc] Fix setjmp build order. #144917

merged 1 commit into from
Jun 19, 2025

Conversation

lntue
Copy link
Contributor

@lntue lntue commented Jun 19, 2025

Fix build order issue from #139555.

@lntue lntue requested review from SchrodingerZhu and jhuber6 June 19, 2025 15:45
@llvmbot llvmbot added the libc label Jun 19, 2025
@llvmbot
Copy link
Member

llvmbot commented Jun 19, 2025

@llvm/pr-subscribers-libc

Author: None (lntue)

Changes

Fix build order issue from #139555.


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

1 Files Affected:

  • (modified) libc/src/setjmp/CMakeLists.txt (+4-3)
diff --git a/libc/src/setjmp/CMakeLists.txt b/libc/src/setjmp/CMakeLists.txt
index 50c827254da65..8b8e74f0955eb 100644
--- a/libc/src/setjmp/CMakeLists.txt
+++ b/libc/src/setjmp/CMakeLists.txt
@@ -1,7 +1,4 @@
 # Process architecture-specific subdirectory FIRST to avoid missing targets.
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LIBC_TARGET_ARCHITECTURE})
-  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/${LIBC_TARGET_ARCHITECTURE})
-endif()
 
 # Then process OS-specific subdirectory
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LIBC_TARGET_OS})
@@ -14,6 +11,10 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LIBC_TARGET_OS})
   )
 endif()
 
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LIBC_TARGET_ARCHITECTURE})
+  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/${LIBC_TARGET_ARCHITECTURE})
+endif()
+
 add_entrypoint_object(
   setjmp
   ALIAS

@SchrodingerZhu SchrodingerZhu merged commit c1ac87b into llvm:main Jun 19, 2025
15 checks passed
@lntue lntue deleted the setjmp branch June 19, 2025 16:17
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