reverted previous commit,

[scpubgit/Object-Remote.git] / lib / Object / Remote / FatNode.pm

diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm
index 819d657..594f281 100644 (file)
--- a/lib/Object/Remote/FatNode.pm
+++ b/lib/Object/Remote/FatNode.pm
@@ -5,7 +5,7 @@ use Config;
 use B qw(perlstring);
 
 my @exclude_mods = qw(XSLoader.pm DynaLoader.pm);
-#used by t/watchdog_fatnode 
+#used by t/watchdog_fatnode
 our $INHIBIT_RUN_NODE = 0;
 
 sub stripspace {
@@ -17,15 +17,18 @@ sub stripspace {
 my %maybe_libs = map +($_ => 1), grep defined, (values %Config, '.');
 
 my @extra_libs = grep not(ref($_) or $maybe_libs{$_}), @INC;
-
-my $extra_libs = join '', map "  -I$_\n", @extra_libs;
+my $extra_libs = join '', map {
+    my $lib = $_;
+    $lib =~ s{'}{'\\''}g;
+    "  -I'$lib'\n";
+} @extra_libs;
 
 my $command = qq(
   $^X
   $extra_libs
   -mObject::Remote
   -mObject::Remote::Connector::STDIO
-  -mCPS::Future
+  -mFuture
   -mMRO::Compat
   -mClass::C3
   -mClass::C3::next
@@ -42,7 +45,7 @@ $command =~ s/\n/ /g;
 
 chomp(my @inc = qx($command));
 
-my %exclude = map { $_ => 1 } @exclude_mods; 
+my %exclude = map { $_ => 1 } @exclude_mods;
 my %mods = reverse @inc;
 my %file_names = @inc;