On Wed, 13 Feb 2013 08:35:26 +0000 Simon Marlow wrote:

On 13/02/13 07:33, Sergei Trofimovich wrote:

...

From: Sergei Trofimovich

Fixed bootstrap failure on linux for --target=mingw32 of such kind:

"/usr/bin/ghc" -o utils/hsc2hs/dist/build/tmp/hsc2hs -static -H32m -O -w -package-db libraries/bootstrapping.conf -hide-all-packages -i -iutils/hsc2hs/. -iutils/hsc2hs/dist/build -iutils/hsc2hs/dist/build/autogen -Iutils/hsc2hs/dist/build -Iutils/hsc2hs/dist/build/autogen -optP-include -optPutils/hsc2hs/dist/build/autogen/cabal_macros.h -package base-4.6.0.0 -package containers-0.5.0.0 -package directory-1.2.0.0 -package filepath-1.3.0.1 -package process-1.1.0.2 -XHaskell98 -XCPP -XForeignFunctionInterface -no-user-package-db -rtsopts -odir utils/hsc2hs/dist/build -hidir utils/hsc2hs/dist/build -stubdir utils/hsc2hs/dist/build -hisuf hi -osuf o -hcsuf hc utils/hsc2hs/dist/build/Main.o utils/hsc2hs/dist/build/HSCParser.o utils/hsc2hs/dist/build/DirectCodegen.o utils/hsc2hs/dist/build/CrossCodegen.o utils/hsc2hs/dist/build/UtilsCodegen.o utils/hsc2hs/dist/build/Common.o utils/hsc2hs/dist/build/C.o utils/hsc2hs/dist/build/Flags.o utils/hsc2hs/dist/build/Paths_hsc2hs.o

...

utils/hsc2hs/dist/build/Main.o: In function `s4cN_info': (.text+0x182): undefined reference to `GetModuleFileNameW'

Signed-off-by: Sergei Trofimovich --- Main.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Main.hs b/Main.hs index 30b3a2d..5309179 100644 --- a/Main.hs +++ b/Main.hs @@ -11,7 +11,7 @@ -- See the documentation in the Users' Guide for more details.

#if defined(__GLASGOW_HASKELL__) && !defined(BUILD_NHC) -#include "../../includes/ghcconfig.h" +#include "ghcconfig.h" #endif

import Control.Monad ( liftM, forM_ )

Looks like this needs to be conditional on whether we're building hsc2hs with stage0 or stage1-2.

Can we restructure build system a bit to generate separate "ghcconfig.h" for all the stages we are trying to build? It would mean generating two local "ghcconfig.h" files and make them available at once: - which are equal to booter compiler in native case - differ from host compiler where in case --target=T (--host=--build=H) stage1's: #define BuildPlatform_TYPE H #define HostPlatform_TYPE H #define TargetPlatform_TYPE T stage2's: #define BuildPlatform_TYPE H #define HostPlatform_TYPE T #define TargetPlatform_TYPE T Thanks! -- Sergei