Skip to content

Commit

Permalink
Fix TBB compilation on OS X.
Browse files Browse the repository at this point in the history
The TBB makefile has its own logic for choosing a compiler, and on OS X 10.7 it picks Clang, even though that will fail to build. We use the CXX argument to the SConstruct to override this, giving us a GCC build by default.
  • Loading branch information
johnhaddon committed Jan 19, 2015
1 parent 1e75a6a commit b012373
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,8 @@ if depEnv["BUILD_DEPENDENCY_FREETYPE"] :
runCommand( "cd $FREETYPE_SRC_DIR && ./configure --prefix=$BUILD_DIR && make clean && make && make install" )

if depEnv["BUILD_DEPENDENCY_TBB"] :
runCommand( "cd $TBB_SRC_DIR; make clean; make" )
tbbCompiler = "clang" if "clang" in env["CXX"] else "gcc"
runCommand( "cd $TBB_SRC_DIR; make clean; make compiler=" + tbbCompiler )
if depEnv["PLATFORM"]=="darwin" :
runCommand( "cd $TBB_SRC_DIR; cp build/macos_*_release/*.dylib $BUILD_DIR/lib; cp -r include/tbb $BUILD_DIR/include" )
else :
Expand Down

0 comments on commit b012373

Please sign in to comment.