Merge branch 'master' of git@github.com:Whiteknight/parrot-linear-alg…

…ebra
Whiteknight · Oct 28, 2009 · 8d158d8 · 8d158d8
2 parents 632761f + 90d7929
commit 8d158d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Configure.nqp b/Configure.nqp
@@ -20,6 +20,11 @@ sub MAIN () {
     # Slurp in the unconfigured Makefile text
     my $unconfigured := slurp(@ARGS[0] || 'config/Makefile.in');
 
+    # Set up our custom @foo@ markers.
+    if ($OS ne 'openbsd') {
+        %VM<config>{'cblas'} := '-lcblas';
+    }
+
     # Replace all of the @foo@ markers
     my $replaced := subst($unconfigured, rx('\@<ident>\@'), replacement);
 

diff --git a/config/Makefile.in b/config/Makefile.in
@@ -23,7 +23,7 @@ CFLAGS        = -fPIC @ccflags@
 LD            = @ld@
 LD_LOAD_FLAGS = @ld_load_flags@
 LDFLAGS       = @ldflags@ @ld_debug@
-LINKARGS      =  $(LDFLAGS) $(LD_LOAD_FLAGS) -lblas
+LINKARGS      =  $(LDFLAGS) $(LD_LOAD_FLAGS) @linkblas@
 
 PARROT_DYNEXT = $(LIB_DIR)/dynext
 PERL6GRAMMAR  = $(LIB_DIR)/library/PGE/Perl6Grammar.pbc