Add -fvia-C to utils/Panic_HC_OPTS, and remove it from main/Main_HC_OPTS.
# The standard suffix rule for compiling a Haskell file
# adds these flags to the command line
# 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
prelude/PrimOp_HC_OPTS = -no-recomp -H80m
# because the NCG can't handle the 64-bit math in here
main/SysTools_HC_OPTS += '-\#include <windows.h>' '-\#include <process.h>'
endif
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"'
# 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"'