3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed static linking against boost.

Browse source
This commit is contained in:
bubnikv 2016-12-14 15:43:26 +01:00
parent ff0a8956ee
commit a870b69733
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xs/Build.PL
View file

@ -120,14 +120,14 @@ my $have_boost = 0;
my @boost_libraries = qw(system thread log); # we need these my @boost_libraries = qw(system thread log); # we need these
# check without explicit lib path (works on Linux) # check without explicit lib path (works on Linux)
if (! $mswin) { if (!$ENV{SLIC3R_STATIC} && ! $mswin) {
$have_boost = 1 $have_boost = 1
if check_lib( if check_lib(
lib => [ map "boost_${_}", @boost_libraries ], lib => [ map "boost_${_}", @boost_libraries ],
); );
} }
if (!$ENV{SLIC3R_STATIC} && $have_boost) { if ($have_boost) {
# The boost library was detected by check_lib on Linux. # The boost library was detected by check_lib on Linux.
push @LIBS, map "-lboost_${_}", @boost_libraries; push @LIBS, map "-lboost_${_}", @boost_libraries;
} else { } else {
@ -139,7 +139,7 @@ if (!$ENV{SLIC3R_STATIC} && $have_boost) {
my @files = glob "$path/${lib_prefix}system*$lib_ext"; my @files = glob "$path/${lib_prefix}system*$lib_ext";
next if !@files; next if !@files;
if ($files[0] =~ /${lib_prefix}system([^.]+)$lib_ext$/) { if ($files[0] =~ /${lib_prefix}system([^.]*)$lib_ext$/) {
# Suffix contains the version number, the build type etc. # Suffix contains the version number, the build type etc.
my $suffix = $1; my $suffix = $1;
# Verify existence of all required boost libraries at $path. # Verify existence of all required boost libraries at $path.