Build: hide USD symbols, make Blender symbols visible again
Following up to b555b8d
.
Building Blender with hidden symbols but using libraries with visible symbols
was giving linker warnings, specifically for USD. So revert that for now, as
it was not needed for the bugfix.
Hide USD symbols (some of which are not in the USD namespace) to avoid potential
conflicts. May potentially help with AMD OpenCL issues in T74262.
This commit is contained in:
parent
f1573731bc
commit
bae1c243ce
Notes:
blender-bot
2023-02-14 18:56:40 +01:00
Referenced by issue blender/blender-addons#76414, Blender crashing when trying to use Cupy
|
@ -453,7 +453,6 @@ endif()
|
|||
set(PLATFORM_LINKFLAGS
|
||||
"${PLATFORM_LINKFLAGS} -Xlinker -unexported_symbols_list -Xlinker '${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map'"
|
||||
)
|
||||
set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -fvisibility=hidden")
|
||||
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
|
||||
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -stdlib=libc++")
|
||||
|
|
|
@ -603,7 +603,6 @@ endif()
|
|||
|
||||
# Avoid conflicts with Mesa llvmpipe, Luxrender, and other plug-ins that may
|
||||
# use the same libraries as Blender with a different version or build options.
|
||||
set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -fvisibility=hidden")
|
||||
set(PLATFORM_LINKFLAGS
|
||||
"${PLATFORM_LINKFLAGS} -Wl,--version-script='${CMAKE_SOURCE_DIR}/source/creator/blender.map'"
|
||||
)
|
||||
|
|
|
@ -58,12 +58,15 @@ local:
|
|||
opj_*;
|
||||
opus_*;
|
||||
*OSL*;
|
||||
*pathYy*;
|
||||
png_*;
|
||||
*SDL*;
|
||||
*squish*;
|
||||
*tbb*;
|
||||
*textFileFormatYy*;
|
||||
*TIFF*;
|
||||
*tinyformat*;
|
||||
*usdBlender*;
|
||||
vorbis*;
|
||||
vp8*;
|
||||
vp9*;
|
||||
|
|
|
@ -49,12 +49,15 @@ ogg*
|
|||
opj_*
|
||||
opus_*
|
||||
*OSL*
|
||||
*pathYy*
|
||||
png_*
|
||||
*SDL*
|
||||
*squish*
|
||||
*tbb*
|
||||
*textFileFormatYy*
|
||||
*TIFF*
|
||||
*tinyformat*
|
||||
*usdBlender*
|
||||
vorbis*
|
||||
vp8*
|
||||
vp9*
|
||||
|
|
Loading…
Reference in New Issue