[project @ 2003-02-20 11:45:24 by simonmar]

Add -fvia-C to utils/Panic_HC_OPTS, and remove it from main/Main_HC_OPTS.

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 29f6eff..958e96c 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -347,9 +347,6 @@ endif
 #      The standard suffix rule for compiling a Haskell file
 #      adds these flags to the command line
 
-# not sure if this is required --SDM
-main/Main_HC_OPTS              = -fvia-C
-
 prelude/PrimOp_HC_OPTS                 = -no-recomp -H80m
 
 # because the NCG can't handle the 64-bit math in here
@@ -408,6 +405,9 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 main/SysTools_HC_OPTS          += '-\#include <windows.h>' '-\#include <process.h>'
 endif
 
+# Required due to use of Concurrent.myThreadId
+utils/Panic_HC_OPTS += -fvia-C
+
 # ghc_strlen percolates through so many modules that it is easier to get its
 # prototype via a global option instead of a myriad of per-file OPTIONS
 SRC_HC_OPTS += '-\#include "hschooks.h"'