Build failure with stable snapshot

[Don Stewart]

The hsc2hs include and lib flags aren't being propagated
through to the hpc package, which fails to build in last  night's
snapshot, on OpenBSD, at:

    Configuring hpc-0.5.0.0...
    rm -f hpc/GNUmakefile
    cp Makefile.local hpc
    if ifBuildable/ifBuildable hpc; then \
       cd hpc && setup/Setup makefile -f GNUmakefile; \
    fi
    Preprocessing library hpc-0.5.0.0...
    In file included from /usr/obj/build/ghc-6.8.0.20071030/includes/Stg.h:150,
                     from /usr/obj/build/ghc-6.8.0.20071030/includes/Rts.h:19,
                     from Reflect.hsc:18:
    /usr/obj/build/ghc-6.8.0.20071030/includes/Regs.h:28:17: gmp.h: No such file or directory
    In file included from /usr/obj/build/ghc-6.8.0.20071030/includes/Stg.h:150,
                     from /usr/obj/build/ghc-6.8.0.20071030/includes/Rts.h:19,
                     from Reflect.hsc:18:
    /usr/obj/build/ghc-6.8.0.20071030/includes/Regs.h:121: error: syntax error before "MP_INT"
    In file included from Reflect.hsc:18:
    /usr/obj/build/ghc-6.8.0.20071030/includes/Rts.h:174:17: gmp.h: No such file or directory
    In file included from Reflect.hsc:18:
    /usr/obj/build/ghc-6.8.0.20071030/includes/Rts.h:203: error: syntax error before '*' token
    /usr/obj/build/ghc-6.8.0.20071030/includes/Rts.h:204: error: syntax error before '*' token
    compiling dist/build/Trace/Hpc/Reflect_hsc_make.c failed
    command was: gcc -c -D__GLASGOW_HASKELL__=608 -I/usr/obj/build/ghc-6.8.0.20071030/includes -I/usr/obj/build/ghc-6.8.0.20071030/gmp/gmpbuild -D__GLASGOW_HASKELL__=608 dist/build/Trace/Hpc/Reflect_hsc_make.c -o dist/build/Trace/Hpc/Reflect_hsc_make.o
    gmake[1]: *** [hpc/GNUmakefile] Error 1
    gmake[1]: Leaving directory `/usr/obj/build/ghc-6.8.0.20071030/libraries'
    gmake: *** [stage1] Error 2

Adding,
    hsc2hs-options: -I/usr/local/include -L/usr/local/lib

Fixes it, but they should be extracted from my mk/build.mk
Ian?

-- Don