Merge pull request #699 from gerdr/gerdr/cygwin

cleanup cygwin build
parrot · Jan 19, 2012 · b9da642 · b9da642
2 parents 86d1c01 + d654278
commit b9da642
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -59,6 +59,7 @@ cachegrind.out.*
 /libparrot.def
 /libparrot.dll
 /libparrot.dll.a
+/cygparrot*.dll
 /miniparrot
 /myconfig
 /ops2c

diff --git a/MANIFEST.generated b/MANIFEST.generated
@@ -8,6 +8,7 @@ blib/lib/libparrot.so                            [main]lib
 blib/lib/libparrot.so.4.0.0                      [main]lib
 compilers/data_json/data_json.pbc                [data_json]
 config/gen/call_list/opengl.in                   []
+cygparrot4_0_0.dll                               [main]bin
 docs/ops/bit.pod                                 [doc]
 docs/ops/cmp.pod                                 [doc]
 docs/ops/core.pod                                [doc]
@@ -159,6 +160,7 @@ lib/Parrot/Config/Generated.pm                   [devel]lib
 lib/Parrot/PMC.pm                                [devel]lib
 lib/Parrot/Pmc2c/PCCMETHOD_BITS.pm               [devel]lib
 libparrot.dll                                    [main]bin
+libparrot.dll.a                                  [main]lib
 libparrot.lib                                    [main]bin
 runtime/parrot/dynext/bit_ops.bundle             [library]
 runtime/parrot/dynext/bit_ops.dll                [library]

diff --git a/config/gen/makefiles/root.in b/config/gen/makefiles/root.in
@@ -548,7 +548,7 @@ INSTALLABLEWINXED   = .@slash@installable_winxed$(EXE)
 # Libraries
 LIBPARROT_STATIC    = @blib_dir@/@libparrot_static@
 #IF(darwin):export DYLD_LIBRARY_PATH := @build_dir@/@blib_dir@:$(DYLD_LIBRARY_PATH)
-#IF(win32 or msys):LIBPARROT_SHARED  = @libparrot_shared@
+#IF(win32 or msys or cygwin):LIBPARROT_SHARED  = @libparrot_shared@
 #ELSE:LIBPARROT_SHARED  = @blib_dir@/@libparrot_shared@
 
 # This line controls whether a static or shared library is built

diff --git a/config/init/hints/cygwin.pm b/config/init/hints/cygwin.pm
@@ -18,8 +18,8 @@ sub runstep {
 
     my $build_dir = $conf->data->get('build_dir');
     $build_dir =~ s/ /\\ /g;
-    my $bindir = $conf->data->get('bindir');
-    $bindir =~ s/ /\\ /g;
+    my $libdir = $conf->data->get('libdir');
+    $libdir =~ s/ /\\ /g;
     my $libparrot_shared = $conf->data->get('libparrot_shared');
     # force cyg prefix
     $libparrot_shared =~ s/^lib/cyg/g;
@@ -49,11 +49,10 @@ sub runstep {
         sym_export          => '__declspec(dllexport)',
         sym_import          => '__declspec(dllimport)',
         libparrot_shared    => $libparrot_shared,
-        blib_dir            => '.',
         libparrot_ldflags   => '-L' . $build_dir . ' -lparrot',
-        inst_libparrot_ldflags => '-L' . $bindir . ' -lparrot',
+        inst_libparrot_ldflags => '-L' . $libdir . ' -lparrot',
         libparrot_linkflags   => '-L' . $build_dir . ' -lparrot',
-        inst_libparrot_linkflags => '-L' . $bindir . ' -lparrot',
+        inst_libparrot_linkflags => '-L' . $libdir . ' -lparrot',
     );
 
     # inet_aton needs to be defined on Cygwin.