Ticket #535: link-installed.patch

config/init/hints/cygwin.pm

@@ -19 +19 @@
 
     my $build_dir = $conf->data->get('build_dir');
     $build_dir =~ s/ /\\ /g;
+    my $bindir = $conf->data->get('bindir');
+    $bindir =~ s/ /\\ /g;
     my $libparrot_shared = $conf->data->get('libparrot_shared');
     # force cyg prefix
     $libparrot_shared =~ s/^lib/cyg/g;
@@ -49 +51 @@
         libparrot_shared    => $libparrot_shared,
         blib_dir            => '.',
         libparrot_ldflags   => '-L' . $build_dir . ' -lparrot',
+        inst_libparrot_ldflags => '-L' . $bindir . ' -lparrot',
     );
 
     # inet_aton needs to be defined on Cygwin.

config/init/hints/mswin32.pm

@@ -37 +37 @@
         $conf->data->set( build_dir => Win32::GetShortPathName($build_dir) );
     }
 
+    my $bindir = $conf->data->get('bindir');
+
+    if ( $bindir =~ /\s/ ) {
+        $conf->data->set( bindir => Win32::GetShortPathName($bindir) );
+    }
+
     if ($is_msvc) {
         my $msvcversion = $conf->data->get('msvcversion');
 
@@ -240 +246 @@
             ld_load_flags       => '-shared ',
             ld_share_flags      => '-shared ',
             libparrot_ldflags   => "\"$build_dir\\libparrot.dll\"",
+            inst_libparrot_ldflags => "\"$bindir\\libparrot.dll\"",
             ncilib_link_extra   => 'src/libnci_test.def',
             sym_export          => '__declspec(dllexport)',
             sym_import          => '__declspec(dllimport)',

config/inter/libparrot.pm

@@ -128 +128 @@
         );
     }
 
+    unless ( defined( $conf->data->get('inst_libparrot_ldflags') ) ) {
+        $conf->data->set(inst_libparrot_ldflags =>
+        '-L'
+        . $conf->data->get('libdir')
+        . ' -lparrot'
+        );
+    }
+
     $self->set_result( $parrot_is_shared ? 'yes' : 'no' );
 
     return 1;

tools/dev/mk_language_shell.pl

@@ -316 +316 @@
 CFLAGS        := @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@
 CC_OUT        := @cc_o_out@
 LD_OUT        := @ld_out@
-#IF(parrot_is_shared):LIBPARROT     := @libparrot_ldflags@
+#IF(parrot_is_shared):LIBPARROT     := @inst_libparrot_ldflags@
 #ELSE:LIBPARROT     :=
 
 OPS2C           := $(PERL) $(LIB_DIR)/tools/build/ops2c.pl
@@ -409 +409 @@
 CFLAGS        := @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@
 CC_OUT        := @cc_o_out@
 LD_OUT        := @ld_out@
-#IF(parrot_is_shared):LIBPARROT     := @libparrot_ldflags@
+#IF(parrot_is_shared):LIBPARROT     := @inst_libparrot_ldflags@
 #ELSE:LIBPARROT     :=
 
 PMC2C_INCLUDES  := --include $(SRC_DIR) --include $(SRC_DIR)/pmc