[svn:parrot] r36404 - in trunk/config: gen/makefiles init/hints

rurban at svn.parrot.org rurban at svn.parrot.org
Fri Feb 6 16:52:49 UTC 2009


Author: rurban
Date: Fri Feb  6 16:52:48 2009
New Revision: 36404
URL: https://trac.parrot.org/parrot/changeset/36404

Log:
TT #278 take 2. 
Fix msvc build for dynpmc, and improve the previous mingw double-quote patch.
Tested ok on msvc, but mingw fails with a probably unrelated loadlib 
assertion:
  src\string\api.c:767: failed assertion 'encoding'

Modified:
   trunk/config/gen/makefiles/dynoplibs_pl.in
   trunk/config/gen/makefiles/dynpmc_pl.in
   trunk/config/init/hints/mswin32.pm

Modified: trunk/config/gen/makefiles/dynoplibs_pl.in
==============================================================================
--- trunk/config/gen/makefiles/dynoplibs_pl.in	Fri Feb  6 13:57:07 2009	(r36403)
+++ trunk/config/gen/makefiles/dynoplibs_pl.in	Fri Feb  6 16:52:48 2009	(r36404)
@@ -35,7 +35,13 @@
 #IF(parrot_is_shared):$LIBPARROT = q[@libparrot_ldflags@];
 
 # Here comes some stuff for Win32.
-our $PATHQUOTE = $^O eq 'MSWin32' ? '"' : '';
+our $PATHQUOTE = q[];
+if ($^O eq 'MSWin32') {
+    # Paths need quoting as they may contain spaces.
+    $PATHQUOTE = q["];
+    # absolute because we are building in src\dynoplibs
+    $LIBPARROT = '@build_dir@/libparrot.lib'; # the importlib, not the static one
+}
 
 # OPS2C Config
 our $OPS2C = "$PERL -I $PATHQUOTE" .

Modified: trunk/config/gen/makefiles/dynpmc_pl.in
==============================================================================
--- trunk/config/gen/makefiles/dynpmc_pl.in	Fri Feb  6 13:57:07 2009	(r36403)
+++ trunk/config/gen/makefiles/dynpmc_pl.in	Fri Feb  6 16:52:48 2009	(r36404)
@@ -43,10 +43,8 @@
 if ($^O eq 'MSWin32') {
     # Paths need quoting as they may contain spaces.
     $PATHQUOTE = '"';
-
-    unless ($CC =~ /gcc/i) {
-        $LIBPARROT = '@build_dir@/libparrot at a@';
-    }
+    # absolute because we are building in src\dynoplibs
+    $LIBPARROT = '@build_dir@/libparrot.lib'; # the importlib, not the static one
 }
 
 # PMC2C Config

Modified: trunk/config/init/hints/mswin32.pm
==============================================================================
--- trunk/config/init/hints/mswin32.pm	Fri Feb  6 13:57:07 2009	(r36403)
+++ trunk/config/init/hints/mswin32.pm	Fri Feb  6 16:52:48 2009	(r36404)
@@ -239,7 +239,6 @@
             has_dynamic_linking => 1,
             ld_load_flags       => '-shared ',
             ld_share_flags      => '-shared ',
-            libparrot_ldflags   => "\"$build_dir\\libparrot.dll\"",
             ncilib_link_extra   => 'src/libnci_test.def',
             sym_export          => '__declspec(dllexport)',
             sym_import          => '__declspec(dllimport)',


More information about the parrot-commits mailing list