Skip to content

Commit e197b3a

Browse files
yuxuanchen1997meta-codesync[bot]
authored andcommitted
still force libc++ to link as shared for now
Summary: We can't force libc++ to be statically linked, even in opt mode due to the present of DSOs, which are widely used in Python environments. Without this patch, cinderx wouldn't work due to its duplicate static and dynamic linkage to libc++. While static linkage to libc++ remains possible in the absence of DSOs, let's force shared for now until we found a solution. Reviewed By: skrueger Differential Revision: D87374284 fbshipit-source-id: f8053c02c3cf3ba0d71247075103ff39b483c6cd
1 parent f777219 commit e197b3a

File tree

1 file changed

+0
-19
lines changed
  • folly/debugging/exception_tracer

1 file changed

+0
-19
lines changed

folly/debugging/exception_tracer/BUCK

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,6 @@ FBCODE_STATIC_LIBSTDCXX_SELECTOR = selects.and_(
189189
),
190190
)
191191

192-
FBCODE_STATIC_LIBCXX_SELECTOR = selects.and_(
193-
selects.cond("ovr_config//runtime/constraints:fbcode"),
194-
selects.cond("ovr_config//cpp:libc++"),
195-
selects.or_(
196-
selects.cond("ovr_config//build_mode/constraints:static"),
197-
selects.cond("ovr_config//build_mode/constraints:static_pic"),
198-
),
199-
)
200-
201192
FOLLY_SHOULD_INSTALL_STATIC_CXA_FUNCTIONS_WRAPPERS = selects.or_(
202193
selects.cond("fbsource//xplat/toolchains/android/ndk:cxx-static-runtime-type"),
203194
FBCODE_STATIC_LIBSTDCXX_SELECTOR,
@@ -206,7 +197,6 @@ FOLLY_SHOULD_INSTALL_STATIC_CXA_FUNCTIONS_WRAPPERS = selects.or_(
206197
FOLLY_SHOULD_INSTALL_STD_RETHROW_EXCEPTION_WRAPPER = selects.or_(
207198
selects.cond("fbsource//xplat/toolchains/android/ndk:cxx-static-runtime-type"),
208199
FBCODE_STATIC_LIBSTDCXX_SELECTOR,
209-
FBCODE_STATIC_LIBCXX_SELECTOR,
210200
)
211201

212202
EXCEPTION_TRACER_LIB_COMPILER_FLAGS = selects.if_(
@@ -358,17 +348,8 @@ LIBSTDCXX_BUCKIFIED_SELECTOR = selects.and_(
358348
selects.cond("ovr_config//third-party/libgcc:11.x"),
359349
)
360350

361-
LIBCXX_STATIC_SELECTOR = selects.and_(
362-
selects.cond("ovr_config//cpp:libc++"),
363-
selects.or_(
364-
selects.cond("ovr_config//build_mode/constraints:static"),
365-
selects.cond("ovr_config//build_mode/constraints:static_pic"),
366-
),
367-
)
368-
369351
STATIC_CXX_STDLIB_SELECTOR = selects.or_(
370352
LIBSTDCXX_BUCKIFIED_SELECTOR,
371-
LIBCXX_STATIC_SELECTOR,
372353
)
373354

374355
fbcode_target(

0 commit comments

Comments
 (0)