From: rrt <unknown>
Date: Tue, 3 Apr 2001 16:30:43 +0000 (+0000)
Subject: [project @ 2001-04-03 16:30:43 by rrt]
X-Git-Tag: Approximately_9120_patches~2211
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=32130c0d86c94c03c3ea2daec784d890f24e53dd

[project @ 2001-04-03 16:30:43 by rrt]
Move mingwin gcc options to opts.mk (put in CC_OPTS always).
---

diff --git a/mk/opts.mk b/mk/opts.mk
index 33ff9d7..cef3052 100644
--- a/mk/opts.mk
+++ b/mk/opts.mk
@@ -5,7 +5,7 @@
 #	This file defines Make variables for the
 #	option flags for each utility program
 #
-# 	$Id: opts.mk,v 1.18 2000/12/20 15:00:01 rrt Exp $
+# 	$Id: opts.mk,v 1.19 2001/04/03 16:30:43 rrt Exp $
 #
 #################################################################################
 
@@ -86,6 +86,9 @@ BLD_DLL_OPTS       = $(SRC_BLD_DLL_OPTS) $(WAY$(_way)_BLD_DLL_OPTS) $($*_HC_OPTS
 CPP_OPTS           = $(SRC_CPP_OPTS) $(WAY$(_way)_CPP_OPTS) $(EXTRA_CPP_OPTS)
 CTAGS_OPTS         = $(SRC_CTAGS_OPTS) $(WAY$(_way)_CTAGS_OPTS) $(EXTRA_CTAGS_OPTS)
 CC_OPTS            = $(SRC_CC_OPTS) $(WAY$(_way)_CC_OPTS) $($*_CC_OPTS) $(EXTRA_CC_OPTS)
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+CC_OPTS += -mno-cygwin -mwin32
+endif
 FLEX_OPTS          = $(SRC_FLEX_OPTS) $(WAY$(_way)_FLEX_OPTS) $(EXTRA_FLEX_OPTS)
 HAPPY_OPTS         = $(SRC_HAPPY_OPTS) $(WAY$(_way)_HAPPY_OPTS) $($*_HAPPY_OPTS) $(EXTRA_HAPPY_OPTS)
 GC_OPTS            = $(SRC_GC_OPTS) $(WAY$(_way)_GC_OPTS) $($*_GC_OPTS) $(EXTRA_GC_OPTS)
diff --git a/mk/target.mk b/mk/target.mk
index e3d6c80..64cf1c9 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -311,10 +311,6 @@ endif
 #----------------------------------------
 #	C programs
 
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-CC_OPTS += -mno-cygwin -mwin32
-endif
-
 ifneq "$(C_PROG)" ""
 all :: $(C_PROG)