cleanup cygwin build

parrot · Jan 18, 2012 · 63b176e · 63b176e
1 parent a8aab9f
commit 63b176e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 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/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
@@ -49,7 +49,6 @@ 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',
         libparrot_linkflags   => '-L' . $build_dir . ' -lparrot',