Skip to content
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

Disable TLS support for iOS. #186

Merged
merged 2 commits into from Jul 25, 2016
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion configure.ac
Expand Up @@ -471,7 +471,11 @@ dnl Multi threaded library.
[dnl Check for IBM's compiler's TLS option.
AX_CXXFLAGS_AIX_OPTION([-qtls])])

AX_TLS_SUPPORT
dnl Check if TLS is supported, but only if it isn't iOS target, because it
dnl is forbidden by Apple Store to use __tlv_* functions.
AS_IF([test "$target_os" != "darwin" -o "$target_cpu" != "arm",
Copy link
Contributor Author

@wilx wilx Jul 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dmigous Just FYI, I have caught a bug in this change: The [] are wrongly balanced. This is fixed by 7b5f53d. Next time, please run ./scripts/doautoreconf.sh and inspect the resulting diff as well. :)

[AX_TLS_SUPPORT]])

AH_TEMPLATE([LOG4CPLUS_HAVE_TLS_SUPPORT])
AH_TEMPLATE([LOG4CPLUS_THREAD_LOCAL_VAR])
AS_IF([test "x$ac_cv_thread_local" = "xyes"],
Expand Down