Skip to content

[libc] Replace mentions of LIBC_FULLBUILD with LLVM_LIBC_FULL_BUILD in 'examples/' #88657

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
Apr 17, 2024

Conversation

Rajveer100
Copy link
Member

Resolves #88328

@llvmbot llvmbot added the libc label Apr 14, 2024
@llvmbot
Copy link
Member

llvmbot commented Apr 14, 2024

@llvm/pr-subscribers-libc

Author: Rajveer Singh Bharadwaj (Rajveer100)

Changes

Resolves #88328


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

2 Files Affected:

  • (modified) libc/examples/README.md (+1-1)
  • (modified) libc/examples/examples.cmake (+2-2)
diff --git a/libc/examples/README.md b/libc/examples/README.md
index 36b886090c6c1c..f3fb45b84f7f72 100644
--- a/libc/examples/README.md
+++ b/libc/examples/README.md
@@ -59,7 +59,7 @@ have installed them, you have to inform CMake that we are linking against the
 full libc as follows:
 
 ```bash
-cmake ../ -G <GEN> -DLIBC_FULLBUILD=ON    \
+cmake ../ -G <GEN> -LLVM_LIBC_FULL_BUILD=ON    \
   -DCMAKE_SYSROOT=<SYSROOT>               \
   -DCMAKE_C_COMPILER=<SYSROOT>/bin/clang  \
   -DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY
diff --git a/libc/examples/examples.cmake b/libc/examples/examples.cmake
index 81e99e3cbede9c..6bb6b41c252f5b 100644
--- a/libc/examples/examples.cmake
+++ b/libc/examples/examples.cmake
@@ -4,13 +4,13 @@ function(add_example name)
     ${ARGN}
   )
 
-  if(LIBC_FULLBUILD)
+  if(LLVM_LIBC_FULL_BUILD)
     target_link_options(${name} PRIVATE -static -rtlib=compiler-rt -fuse-ld=lld)
   elseif(LIBC_OVERLAY_ARCHIVE_DIR)
     target_link_directories(${name} PRIVATE ${LIBC_OVERLAY_ARCHIVE_DIR})
     target_link_options(${name} PRIVATE -l:libllvmlibc.a)
   else()
-    message(FATAL_ERROR "Either LIBC_FULLBUILD should be on or "
+    message(FATAL_ERROR "Either LLVM_LIBC_FULL_BUILD should be on or "
                         "LIBC_OVERLAY_ARCHIVE_DIR should be set.")
   endif()
 endfunction()

@Rajveer100 Rajveer100 force-pushed the branch-for-issue-88328 branch from 3f68076 to 1723339 Compare April 14, 2024 12:47
@Rajveer100 Rajveer100 requested a review from jhuber6 April 14, 2024 12:47
@Rajveer100
Copy link
Member Author

@nickdesaulniers
Could you land this for me?

@jhuber6 jhuber6 merged commit fda04b1 into llvm:main Apr 17, 2024
@Rajveer100
Copy link
Member Author

Thanks! @jhuber6

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.

[libc] examples/ s/LIBC_FULLBUILD/LLVM_LIBC_FULL_BUILD/
3 participants