diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-02-28 17:16:29 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-02-28 17:16:29 +0100 |
| commit | 1fa541b76f9ea18bc573fd3ff0c27ecd739424ee (patch) | |
| tree | 32000d9d8b18aea7334a9da2cb17752bf981488e /make/utilities.pm | |
| parent | f176b7fda8800ac6bb1582be60162420b70a71d9 (diff) | |
| parent | 0a3b54f599e20fcccaacc655535c0682803fe348 (diff) | |
Merge pull request #784 from ShutterQuick/patch-1
Fix build problem on Solaris
Diffstat (limited to 'make/utilities.pm')
| -rw-r--r-- | make/utilities.pm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/make/utilities.pm b/make/utilities.pm index 7ef3e3c11..ebca57b68 100644 --- a/make/utilities.pm +++ b/make/utilities.pm @@ -86,7 +86,7 @@ sub make_rpath($;$) print "Adding extra library path to \e[1;32m$module\e[0m ... \e[1;32m$libpath\e[0m\n"; $already_added{$libpath} = 1; } - $output .= "-Wl,--rpath -Wl,$libpath -L$libpath " unless defined $main::opt_disablerpath; + $output .= "-Wl,-rpath -Wl,$libpath -L$libpath " unless defined $main::opt_disablerpath; $data =~ s/-L(\S+)//; } return $output; @@ -434,7 +434,6 @@ sub translate_functions($$) while ($line =~ /rpath\("(.+?)"\)/) { my $replace = make_rpath($1,$module); - $replace = "" if ($^O =~ /darwin/i); $line =~ s/rpath\("(.+?)"\)/$replace/; } }; |