phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-10 11:57:28 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

build: remove duplicate visibility attribute detection

Browse source 
We are already testing for this, and our test works correctly with a Darwin
target, where the macro does not. Darwin targets do not support "protected"
visibility.
This commit is contained in:
fanquake 2020-07-14 19:06:37 +08:00
parent 937dfa8398
commit 1624e17b54
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

@ -813,7 +813,6 @@ if test x$ac_cv_sys_large_files != x &&
CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files" CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files"
fi fi
AX_GCC_FUNC_ATTRIBUTE([visibility])
AX_GCC_FUNC_ATTRIBUTE([dllexport]) AX_GCC_FUNC_ATTRIBUTE([dllexport])
AX_GCC_FUNC_ATTRIBUTE([dllimport]) AX_GCC_FUNC_ATTRIBUTE([dllimport])
@ -984,13 +983,13 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
[ AC_MSG_RESULT(no)] [ AC_MSG_RESULT(no)]
) )
AC_MSG_CHECKING([for visibility attribute]) AC_MSG_CHECKING([for default visibility attribute])
AC_LINK_IFELSE([AC_LANG_SOURCE([ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
int foo_def( void ) __attribute__((visibility("default"))); int foo(void) __attribute__((visibility("default")));
int main(){} int main(){}
])], ])],
[ [
AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE,1,[Define if the visibility attribute is supported.]) AC_DEFINE(HAVE_DEFAULT_VISIBILITY_ATTRIBUTE,1,[Define if the visibility attribute is supported.])
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
], ],
[ [

2
src/script/bitcoinconsensus.h
View file

@ -18,7 +18,7 @@
#define EXPORT_SYMBOL #define EXPORT_SYMBOL
#endif #endif
#endif #endif
#elif defined(HAVE_FUNC_ATTRIBUTE_VISIBILITY) #elif defined(HAVE_DEFAULT_VISIBILITY_ATTRIBUTE)
#define EXPORT_SYMBOL __attribute__ ((visibility ("default"))) #define EXPORT_SYMBOL __attribute__ ((visibility ("default")))
#endif #endif
#elif defined(MSC_VER) && !defined(STATIC_LIBBITCOINCONSENSUS) #elif defined(MSC_VER) && !defined(STATIC_LIBBITCOINCONSENSUS)