Skip to content

Commit a23a17a

Browse files
author
Rob Patro
committed
add fPIC to jellyfish flags
1 parent 5fbfa46 commit a23a17a

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ set (PTHREAD_LIB)
8181
##
8282
# First take care of what to do if we have gcc
8383
##
84+
set (JELLYFISH_CXX_FLAGS "-fPIC")
8485
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
8586
execute_process(
8687
COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
@@ -118,7 +119,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
118119
if (HAVE_LIBCPP)
119120
message ("It appears that you're compiling with clang and that libc++ is available, so I'll use that")
120121
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
121-
set (JELLYFISH_CXX_FLAGS "-stdlib=libc++")
122+
set (JELLYFISH_CXX_FLAGS "${JELLYFISH_CXX_FLAGS} -stdlib=libc++")
122123
# Otherwise, use libstdc++ (and make it static)
123124
else()
124125
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++")

scripts/compile.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,6 @@ make
7373
make install
7474
make test
7575
cd ../scripts
76-
bash make-release.sh -v ${version} -n CentOS5
76+
bash make-release.sh -v ${version} -n linux_x86-64
7777
cd ../RELEASES
7878
cp *.tar.gz /io/

0 commit comments

Comments
 (0)