diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2019-08-27 17:07:47 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2019-08-27 17:07:47 +0200 |
| commit | a4ef665e379e81656ffb07f9290e7573c137350f (patch) | |
| tree | 6296e26eca6363d6f6639ace4804a5ffc709cc71 | |
| parent | c148d4c35419607354fd1cecd1aaa776e7b71569 (diff) | |
Temporary fix for multiple whole archive linking issue
| -rw-r--r-- | libbuild2/buildfile | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/libbuild2/buildfile b/libbuild2/buildfile index b536eba..c496c52 100644 --- a/libbuild2/buildfile +++ b/libbuild2/buildfile @@ -12,7 +12,9 @@ import int_libs = libbutl%lib{butl} # Note that this won't work on libul{} since it's never installed. # lib{build2}: cxx{utility-installed}: for_install = true -liba{build2}: bin.whole = true # See utility-installed.cxx. + +# @@ TMP +#liba{build2}: bin.whole = true # See utility-installed.cxx. # Keep dependency on libul{build2} after cxx{utility-installed}. # @@ -96,14 +98,6 @@ objs{context}: cxx.poptions += -DLIBBUILD2_SHARED_BUILD if ($cxx.target.class != 'windows') { - if ($cxx.target.class == 'linux') - { - # Make sure we use RPATH and not RUNPATH since the latter messes up - # dlopen(). - # - cxx.loptions += -Wl,--disable-new-dtags - } - cxx.libs += -lpthread if ($cxx.target.class != "bsd") |