moarvm.pach

diff --git a/build/Config/BuildEnvironment.pm b/build/Config/BuildEnvironment.pm
index 9cfaa6f..5b2b9bd 100644
--- a/build/Config/BuildEnvironment.pm
+++ b/build/Config/BuildEnvironment.pm
@@ -74,8 +74,8 @@ my %TOOLCHAINS = (
 
                 # Required flags
                 cmiscflags  => '-D_REENTRANT -D_LARGEFILE64_SOURCE -Wparentheses -Wreturn-type',
-                lmiscflags  => '-L3rdparty/apr/.libs',
-                llibs       => '-Wl,-Bstatic -lapr-1 -Wl,-Bdynamic -lpthread -lm',
+                lmiscflags  => '',
+                llibs       => '3rdparty/apr/.libs/libapr-1.a -lpthread -lm',
 
                 # Optional settings
                 # XXXX: What instrumentation is available for GCC?
@@ -94,8 +94,8 @@ my %TOOLCHAINS = (
 
                 # Required flags
                 cmiscflags  => '-fno-omit-frame-pointer -fno-optimize-sibling-calls',
-                lmiscflags  => '-L3rdparty/apr/.libs',
-                llibs       => '-Wl,-Bstatic -lapr-1 -Wl,-Bdynamic -lpthread -lm',
+                lmiscflags  => '',
+                llibs       => '3rdparty/apr/.libs/libapr-1.a -lpthread -lm',
 
                 # Optional settings
                 copt        => '-O3',
@@ -216,8 +216,6 @@ sub detect {
            %config, %{ $TOOLCHAINS{$compiler} },
         );
         options( \%config, $opts );
-
-        $config{llibs} = '-lapr-1 -lpthread -lm' if $^O eq 'darwin' and $compiler eq 'clang';
     }
     else {
         return (excuse => 'No recognized operating system or compiler found.'."  found: $^O");