[clang] Revert "Fix a cmake error when using the Xcode generator." (PR #122454)
Aaron Ballman via cfe-commits
cfe-commits at lists.llvm.org
Fri Jan 10 05:48:48 PST 2025
https://github.com/AaronBallman created https://github.com/llvm/llvm-project/pull/122454
Reverts llvm/llvm-project#119403
>From 8876f169829dd3c8dfebcfe9652fb1059ce75325 Mon Sep 17 00:00:00 2001
From: Aaron Ballman <aaron at aaronballman.com>
Date: Fri, 10 Jan 2025 08:48:34 -0500
Subject: [PATCH] Revert "Fix a cmake error when using the Xcode generator.
(#119403)"
This reverts commit 1842a3d833d934793012c717e98b10d51193fd0d.
---
clang/cmake/modules/AddClang.cmake | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
index cdc8bd5cd503b4..091aec98e93ca3 100644
--- a/clang/cmake/modules/AddClang.cmake
+++ b/clang/cmake/modules/AddClang.cmake
@@ -109,14 +109,13 @@ macro(add_clang_library name)
llvm_add_library(${name} ${LIBTYPE} ${ARG_UNPARSED_ARGUMENTS} ${srcs})
if(MSVC AND NOT CLANG_LINK_CLANG_DYLIB)
- # Make sure all consumers also turn off visibility macros so they're not
- # trying to dllimport symbols.
+ # Make sure all consumers also turn off visibility macros so there not trying to dllimport symbols.
target_compile_definitions(${name} PUBLIC CLANG_BUILD_STATIC)
if(TARGET "obj.${name}")
target_compile_definitions("obj.${name}" PUBLIC CLANG_BUILD_STATIC)
endif()
- elseif(TARGET "obj.${name}" AND NOT ARG_SHARED AND NOT ARG_STATIC)
- # Clang component libraries linked to clang-cpp are declared without SHARED or STATIC
+ elseif(NOT ARG_SHARED AND NOT ARG_STATIC)
+ # Clang component libraries linked in to clang-cpp are declared without SHARED or STATIC
target_compile_definitions("obj.${name}" PUBLIC CLANG_EXPORTS)
endif()
More information about the cfe-commits
mailing list