[project @ 2000-03-14 01:38:43 by sof]

Support for setting target-specific CC options via AC_SUBST (and make use
of it on the mingw32 front -- 'resist' the temptation to use GMP's config/
story for this.)

diff --git a/ghc/rts/gmp/Makefile.in b/ghc/rts/gmp/Makefile.in
index ab5c133..c0871fc 100644 (file)
--- a/ghc/rts/gmp/Makefile.in
+++ b/ghc/rts/gmp/Makefile.in
@@ -29,7 +29,7 @@ includedir = $(prefix)/include
 
 CC = gcc
 LOCAL_CC = $(CC)
-CFLAGS = -O
+CFLAGS = @CFLAGS@
 XCFLAGS = 
 AR = ar
 AR_FLAGS = rc

diff --git a/ghc/rts/gmp/configure.in b/ghc/rts/gmp/configure.in
index 42192b5..9febef2 100644 (file)
--- a/ghc/rts/gmp/configure.in
+++ b/ghc/rts/gmp/configure.in
@@ -1,12 +1,13 @@
 # This file is a shell script fragment that supplies the information
 # necessary for a configure script to process the program in
 # this directory.  For more information, look at ../configure.
+AC_INIT(Makefile.in)
 
 configdirs="mpn mpz mpf mpq mpbsd"
 srctrigger=gmp-impl.h
 srcname="GNU Multi-Precision library"
 
-# per-host:
+CFLAGS="-O"
 
 # per-target:
 
@@ -31,5 +32,10 @@ case "${target}" in
     ;;
   *-*-linux*)
     target_makefile_frag=config/mt-linux ;;
-    
+  *-*-mingw32)
+    CFLAGS="-mno-cygwin -O"
+    ;;
 esac
+
+AC_SUBST(CFLAGS)
+AC_OUTPUT(Makefile)