Changeset 17057 for util

Timestamp:

07/14/07 06:25:02 (17 months ago)

Author:

audreyt

Message:

* build_pugs.pl: Even more sequashing of obsolete cases

for GHC 6.4.x.

Files:

• util/build_pugs.pl (modified) (2 diffs)

util/build_pugs.pl

@@ -80 +80 @@
         };
 
-        #unshift @args, '-optc-ID:\ghc\ghc-6.4.2\include\mingw', '-optc-ID:\ghc\ghc-6.4.2\gcc-lib\include', '-optc-I/usr/include', '-optc-I/usr/include/cygwin', '-D__CYGWIN__',
         unshift @args, '-I/usr/lib/perl5/5.8/cygwin/CORE',
-            '-optc-ID:\ghc\ghc-6.4.2\include\mingw',
+            "-optc-IC:\\ghc\\ghc-$ghc_version\\include\\mingw",
+            "-optc-ID:\\ghc\\ghc-$ghc_version\\include\\mingw",
             '-optc-I/usr/include',
             '-optl-I/usr/include/cygwin';
         for my $arg (@args) {
             $arg =~ s{(-optc-[IL]|-optl|-optl-L|-I|-L)(/\S+)}{$1 . $cygpath->($2)}eg;
-            #if ($arg =~ m{D:/cygwin/usr/include}i) {
-            #    $arg = '-optc-ID:\ghc\ghc-6.4.2\include\mingw';
-            #}
-        }
-
-        #push @args, '-optc-I$cywin_path/lib/perl5/5.8/cygwin/CORE',
-        #    '-optl-L$cygwin_path/lib/perl5/5.8/cygwin/CORE';
-        #warn "\n\n [248] !!!\n\n @args \n\n !!!!\n\n";
+        }
     }
 
@@ -526 +519 @@
 
     if ($^O =~ /(?:MSWin32|mingw|msys|cygwin)/) {
-        $add_dep->('Win32 -any') unless $ghc_version =~ /^6.4(?:.0)?$/;
+        $add_dep->('Win32 -any');
     }
     else {