#-----------------------------------------------------------------------------
# Setting the GHC compile options
-SRC_HC_OPTS += -cpp -fglasgow-exts $(GhcLibHcOpts)
+# -fvia-C added because NCG still can't cope with some primops used in the standard library
+SRC_HC_OPTS += -fvia-C -cpp -fglasgow-exts $(GhcLibHcOpts)
SRC_HSC2HS_OPTS += -Icbits
ifdef USE_REPORT_PRELUDE
SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
#-----------------------------------------------------------------------------
+# Pre-processing (.pp) files
+SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional
+SRC_CPP_OPTS += ${GhcLibCppOpts}
+
+#-----------------------------------------------------------------------------
# Rules
PrelPrimopWrappers.hs: ../../compiler/prelude/primops.txt
ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-# Standard rule
-HSstd.o :: $(GHCI_LIBOBJS)
- ld -r -x -o $@ $(GHCI_LIBOBJS)
-
+LIBOBJS=$(GHCI_LIBOBJS)
else
# Rule for Win32 platform
# Keep HSstd.o as a pseudo-target (I think)
+
+# Turn off standard rule which creates HSstd.o from LIBOBJS.
+DONT_WANT_STD_GHCI_LIB_RULE=YES
+
HSstd.o :: $(GHCI_LIBOBJS)
ld -r -x -o HSstd1.o $(filter Prel%, $(GHCI_LIBOBJS))
ld -r -x -o HSstd2.o $(filter-out Prel%, $(GHCI_LIBOBJS))
+ @touch HSstd.o
endif # TARGETPLATFORM = i386-unknown-mingw32
-
-
#-----------------------------------------------------------------------------
# Installation; need to install .hi files as well as libraries
#
ifeq "$(ILXized)" "YES"
-SRC_HC_OPTS += -optI--assembly-name -optIstd.$(way_)o -optI--module
+SRC_HC_OPTS += -optI--assembly-name -optIstd.$(way_)o -optI--module -DILX
HS_ILX+=PrelGHC.$(way_)o
PrelGHC.$(way_)o: PrelGHC.ilx.real
$(ILASM) /QUIET /DLL /OUT=$@ $@.il
# mv $@.tmp $@
-PrelGHC.$(way_)hi: PrelGHC.hi-boot
- cp $< $@
-
-std.dll: $(HS_OBJS)
- al -out:$@ $(HS_OBJS)
-
std.$(way_)mvl: $(HS_IL)
((ILVALID_HOME=c:\\devel\\fcom\\src\\ ILVALID_MSCORLIB=mscorlib.vlb $(ILVALID) c:\\devel\\fcom\\src\\bin\\msilxlib$(ilx2il_suffix).vlb $(HS_IL)) 2>&1) | tee $@
std.$(way_)vlb: std.dll
-# echo "call devcorb2gen fastchecked" > tmp.bat
- echo "copy c:\\devel\\fcom\\bin\\msilxlib.$(ILX_WAY).dll msilxlib.$(ILX_WAY).dll" > tmp.bat
- echo "copy c:\\devel\\fcom\\bin\\mkvlb.exe ." >> tmp.bat
- echo "copy c:\\devel\\fcom\\bin\\mkvlb.pdb ." >> tmp.bat
- echo ".\\mkvlb.exe -V -o $@.tmp std" >> tmp.bat
+ mkvlb.exe -V -o $@.tmp std
cmd /c tmp.bat
mv $@.tmp $@