Skip to content

Commit

Permalink
LLVM : Use static libs
Browse files Browse the repository at this point in the history
This fixes crashes caused by conflicts between Gaffer's LLVM and the LLVM used by certain open-source graphics drivers. Might well be applicable to GafferHQ/gaffer/issues/1245 and GafferHQ/gaffer/issues/901.
  • Loading branch information
johnhaddon committed Feb 1, 2018
1 parent a9ebd93 commit e233f01
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build/buildLLVM.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ cd `dirname $0`/../llvm-3.4
export CXX=g++
export CC=gcc

./configure --prefix=$BUILD_DIR --enable-shared --enable-optimized --enable-assertions=no
./configure --prefix=$BUILD_DIR --enable-optimized --enable-assertions=no
env REQUIRES_RTTI=1 make VERBOSE=1 -j `getconf _NPROCESSORS_ONLN` && make install
1 change: 1 addition & 0 deletions build/buildOSL.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ rm -f CMakeCache.txt

cmake \
-D ENABLERTTI=1 \
-D LLVM_STATIC=1 \
-D CMAKE_INSTALL_PREFIX=$BUILD_DIR \
-D CMAKE_PREFIX_PATH=$BUILD_DIR \
-D STOP_ON_WARNING=0 \
Expand Down
1 change: 0 additions & 1 deletion build/buildPackage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ manifest="
lib/libOpenImageIO*$SHLIBSUFFIX*
lib/libOpenColorIO*$SHLIBSUFFIX*
lib/libLLVM*$SHLIBSUFFIX*
lib/libosl*
lib/libpython*$SHLIBSUFFIX*
Expand Down

0 comments on commit e233f01

Please sign in to comment.