Skip to content

Commit 4ae9e78

Browse files
committed
Merge pull request #454 from andrewkaufman/dlFix
This allows us to build modern 3delight at Image Engine.
2 parents ceedfd8 + 2557609 commit 4ae9e78

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

SConstruct

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1648,8 +1648,18 @@ riLibs = []
16481648

16491649
if doConfigure :
16501650

1651-
c = Configure( riEnv )
1652-
1651+
# Since we only build shared libraries and not exectuables,
1652+
# we only need to check that shared libs will link correctly.
1653+
# This is necessary for 3delight 12.0.20 and newer, which use
1654+
# a run-time compatible, but link-time incompatbile libstdc++
1655+
# in some obscure studio setups. This approach succeeds because
1656+
# building a shared library doesn't require resolving the
1657+
# unresolved symbols of the libraries that it links to.
1658+
riCheckEnv = riEnv.Clone()
1659+
riCheckEnv.Append( CXXFLAGS = [ "-fPIC" ] )
1660+
riCheckEnv.Append( LINKFLAGS = [ "-shared" ] )
1661+
c = Configure( riCheckEnv )
1662+
16531663
haveDelight = c.CheckLibWithHeader( "3delight", "ri.h", "CXX" )
16541664
havePRMan = c.CheckLibWithHeader( "prman", "ri.h", "CXX" )
16551665

0 commit comments

Comments
 (0)