Get moar.dll symbols visible in extops on Win32.

This has all the elegance of a manatee, but seems to work.
rakudo · Oct 24, 2013 · 0ee6fa8 · 0ee6fa8
1 parent 7b4a723
commit 0ee6fa8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Configure.pl b/Configure.pl
@@ -215,6 +215,10 @@
         print "Using $config{m_nqp}.\n";
 
         $config{'perl6_ops_dll'} = sprintf($nqp_config{'moar::dll'}, 'perl6_ops_moar');
+
+        # Windows tweaks.
+        $config{'moarimplib'} = $^O eq 'MSWin32' ? "$prefix/bin/moar.dll.lib" : '';
+        $nqp_config{'moar::ldshared'} =~ s{/implib\S+}{};
 
         fill_template_file('tools/build/Makefile-Moar.in', $MAKEFILE, %config, %nqp_config);
     }

diff --git a/tools/build/Makefile-Moar.in b/tools/build/Makefile-Moar.in
@@ -9,7 +9,7 @@ M_GEN_CAT = tools/build/gen-cat.pl moar
 
 PREFIX = @prefix@
 MOAR   = $(PREFIX)@slash@bin@slash@moar@exe@
-M_NQP  = $(PREFIX)@slash@bin@slash@nqp@runner_suffix@
+M_NQP  = $(PREFIX)@slash@bin@slash@nqp-m@runner_suffix@
 
 M_RUNNER = perl6-m@runner_suffix@
 
@@ -182,7 +182,7 @@ $(M_PERL6_OPS_DLL): $(M_PERL6_OPS_SRC) Makefile
 	    -I$(PREFIX)/include/dyncall -I$(PREFIX)/include/linenoise -I$(PREFIX)/include/moar \
 	    -I$(PREFIX)/include/sha1 -I$(PREFIX)/include/tinymt  -I$(PREFIX)/include/libtommath \
 	    -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::ccout@$(M_PERL6_OPS_OBJ) $(M_PERL6_OPS_SRC)
-	$(LD) @moar::ldswitch@ @moar::ldshared@ $(LDFLAGS) @moar::ldout@$(M_PERL6_OPS_DLL) $(M_PERL6_OPS_OBJ)
+	$(LD) @moar::ldswitch@ @moar::ldshared@ $(LDFLAGS) @moar::ldout@$(M_PERL6_OPS_DLL) $(M_PERL6_OPS_OBJ) @moarimplib@
 
 $(PERL6_ML_MOAR): src/Perl6/ModuleLoader.nqp src/vm/moar/ModuleLoaderVMConfig.nqp
 	$(PERL) $(M_GEN_CAT) src/vm/moar/ModuleLoaderVMConfig.nqp src/Perl6/ModuleLoader.nqp > src/gen/m-ModuleLoader.nqp