Skip to content

Commit

Permalink
Merge pull request #61 from hendrik-cliqz/linking-options
Browse files Browse the repository at this point in the history
fix static link version
  • Loading branch information
hendrikmuhs committed Dec 4, 2015
2 parents cf2ecda + f42c55e commit 2de76c4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
5 changes: 3 additions & 2 deletions keyvi/SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,12 @@ env.SConsignFile()

#build tpie dependency

tpie_build_cmd = "cd 3rdparty/tpie && mkdir -p build && cd build && cmake -D CMAKE_CXX_COMPILER=" + env["CXX"]
tpie_build_cmd = "cd 3rdparty/tpie && mkdir -p build && cd build &&"

if custom_boost:
tpie_build_cmd += "export BOOST_ROOT={} && ".format(custom_boost)
tpie_build_cmd += " export BOOST_ROOT={} && ".format(custom_boost)

tpie_build_cmd += " cmake -D CMAKE_CXX_COMPILER=" + env["CXX"]
tpie_build_cmd += " -D CMAKE_BUILD_TYPE:STRING=Release -D CMAKE_INSTALL_PREFIX=install -D TPIE_PARALLEL_SORT=1 -D CMAKE_CXX_FLAGS=\"-fPIC -std=c++11\" .. && "
tpie_build_cmd += "make -j " + str(GetOption('num_jobs')) + " && make install"

Expand Down
5 changes: 2 additions & 3 deletions pykeyvi/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
linklibraries.remove('boost_thread')
linklibraries.append('boost_thread-mt')


#########################
# Custom 'build' command
#########################
Expand Down Expand Up @@ -82,6 +81,8 @@ def run(self):
extra_link_arguments.append('-Wl,-Bdynamic')
extra_link_arguments.append('-static-libstdc++')
extra_link_arguments.append('-static-libgcc')
# workaround: link librt explicitly
linklibraries.append("rt")
else:
# no static linking, add the libs to dynamic linker
linklibraries += linklibraries_static_or_dynamic
Expand Down Expand Up @@ -111,8 +112,6 @@ def run(self):
library_dirs = [os.path.join(dictionary_sources, '3rdparty/tpie/build/install/lib')],
libraries = linklibraries)]



PACKAGE_NAME = 'pykeyvi'

setup(
Expand Down

0 comments on commit 2de76c4

Please sign in to comment.