This is an archive of the discontinued LLVM Phabricator instance.

Differential D42436

libcxx: Allow auto-linking to be disabled with a macro.
ClosedPublic

Authored by pcc on Jan 23 2018, 11:43 AM.

Details

Reviewers
compnerd
smeenai
EricWF
Commits
rGfcac3c9642d2: libcxx: Allow auto-linking to be disabled with a macro.
rCXX323300: libcxx: Allow auto-linking to be disabled with a macro.
rL323300: libcxx: Allow auto-linking to be disabled with a macro.
Summary

Some users may have a custom build system which gives a different
name to the libc++ archive (or does not create an archive at all,
instead passing the object files directly to the linker). Give those
users a way to disable auto-linking.

Diff Detail

Repository
rL LLVM

Event Timeline

pcc created this revision.Jan 23 2018, 11:43 AM
Herald added a reviewer: EricWF. · View Herald TranscriptJan 23 2018, 11:43 AM
Harbormaster completed remote builds in B14152: Diff 131121.Jan 23 2018, 11:46 AM
compnerd added a comment.Jan 23 2018, 3:13 PM

I'm fine with the idea of this knob, I just would prefer a slightly different implementation. Could you wrap the entire block in the defined(_LIBCPP_NO_AUTO_LINK) rather than adding the additional conditional? I feel like it makes it easier to read.

pcc updated this revision to Diff 131181.Jan 23 2018, 5:38 PM
  • Wrap the auto-link block in an ifndef
Harbormaster completed remote builds in B14172: Diff 131181.Jan 23 2018, 5:38 PM
pcc added a comment.Jan 23 2018, 5:38 PM
In D42436#985780, @compnerd wrote:

I'm fine with the idea of this knob, I just would prefer a slightly different implementation. Could you wrap the entire block in the defined(_LIBCPP_NO_AUTO_LINK) rather than adding the additional conditional? I feel like it makes it easier to read.

Done.

compnerd accepted this revision.Jan 23 2018, 7:30 PM

IMO !defined(...) makes it easier to alter in the future IMO.

This revision is now accepted and ready to land.Jan 23 2018, 7:30 PM
Closed by commit rL323300: libcxx: Allow auto-linking to be disabled with a macro. (authored by pcc). · Explain WhyJan 23 2018, 8:32 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
libcxx/
trunk/
include/
12 lines

Diff 131193

libcxx/trunk/include/__config

Show First 20 Lines • Show All 1,279 Lines • ▼ Show 20 Lines# define _LIBCPP_PUSH_MACROS \
_Pragma("push_macro(\"min\")") \ _Pragma("push_macro(\"min\")") \
_Pragma("push_macro(\"max\")") _Pragma("push_macro(\"max\")")
# define _LIBCPP_POP_MACROS \ # define _LIBCPP_POP_MACROS \
_Pragma("pop_macro(\"min\")") \ _Pragma("pop_macro(\"min\")") \
_Pragma("pop_macro(\"max\")") _Pragma("pop_macro(\"max\")")
# endif # endif
#endif // defined(_LIBCPP_HAS_NO_PRAGMA_PUSH_POP_MACRO) #endif // defined(_LIBCPP_HAS_NO_PRAGMA_PUSH_POP_MACRO)
#ifndef _LIBCPP_NO_AUTO_LINK
#if defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_BUILDING_LIBRARY) # if defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_BUILDING_LIBRARY)
# if defined(_DLL) # if defined(_DLL)
# pragma comment(lib, "c++.lib") # pragma comment(lib, "c++.lib")
# else # else
# pragma comment(lib, "libc++.lib") # pragma comment(lib, "libc++.lib")
# endif # endif
#endif // defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_BUILDING_LIBRARY) # endif // defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_BUILDING_LIBRARY)
#endif // _LIBCPP_NO_AUTO_LINK
#endif // __cplusplus #endif // __cplusplus
#endif // _LIBCPP_CONFIG #endif // _LIBCPP_CONFIG