Changeset 44025 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Dec 4, 2012 1:33:34 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

82449

Message:

Put IN_RT_STATIC in the VBOXR3STATIC template so everyone have the right expectations regaring import/export declarations. Some := required in Runtime/Makefile.kmk to prevent define 'leaks' between targets during kBuild/footer.kmk.

File:

• trunk/src/VBox/Runtime/r3/posix/thread-posix.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/posix/thread-posix.cpp

@@ -48 +48 @@
 # include <mach/mach_host.h>
 #endif
-#ifdef IN_RT_STATIC
-/* The pthread_setname_np trickery below assumes a working dl env which is
- * not guaranteed in the context of a fully static executable. */
-# undef IPRT_MAY_HAVE_PTHREAD_SET_NAME_NP
-#else
-# if defined(RT_OS_DARWIN) /*|| defined(RT_OS_FREEBSD) - later */ || defined(RT_OS_LINUX) \
+#if defined(RT_OS_DARWIN) /*|| defined(RT_OS_FREEBSD) - later */ \
+ || (defined(RT_OS_LINUX) && !defined(IN_RT_STATIC) /* static + dlsym = trouble */) \
  || defined(IPRT_MAY_HAVE_PTHREAD_SET_NAME_NP)
-#  define IPRT_MAY_HAVE_PTHREAD_SET_NAME_NP
-#  include <dlfcn.h>
-# endif
+# define IPRT_MAY_HAVE_PTHREAD_SET_NAME_NP
+# include <dlfcn.h>
 #endif
 #if defined(RT_OS_HAIKU)