[MLton] Re: [MLton-commit] r7416

Matthew Fluet matthew.fluet at gmail.com
Mon Feb 15 09:21:38 PST 2010


On Mon, Feb 15, 2010 at 9:57 AM, Wesley Terpstra <wesley at mlton.org> wrote:
> Fix Makefile to work with 'make -j X'.
> gdtoa/*.o was rebuilt in-place as pic, gdb, and normal.
> This made it break if compiled concurrently.
>
>
> ----------------------------------------------------------------------
>
> U   mlton/trunk/runtime/Makefile
>
> ----------------------------------------------------------------------
>
> Modified: mlton/trunk/runtime/Makefile
> ===================================================================
> --- mlton/trunk/runtime/Makefile        2010-02-13 12:47:42 UTC (rev 7415)
> +++ mlton/trunk/runtime/Makefile        2010-02-15 14:57:21 UTC (rev 7416)
> @@ -217,6 +217,15 @@
>        $(shell find basis -type f | grep '\.h$$')
>  BASISCFILES :=                                                 \
>        $(shell find basis -type f | grep '\.c$$')
> +GDTOACFILES :=                                                                 \
> +       dmisc.c    g__fmt.c   misc.c     strtoIdd.c  strtopdd.c  strtorf.c      \
> +       dtoa.c     gmisc.c    smisc.c    strtoIf.c   strtopf.c   strtorQ.c      \
> +       g_ddfmt.c  g_Qfmt.c   strtod.c   strtoIg.c   strtopQ.c   strtorx.c      \
> +       g_dfmt.c   g_xfmt.c   strtodg.c  strtoIQ.c   strtopx.c   strtorxL.c     \
> +       gdtoa.c    g_xLfmt.c  strtodI.c  strtoIx.c   strtopxL.c  sum.c          \
> +       gethex.c   hd_init.c  strtof.c   strtoIxL.c  strtord.c   ulp.c          \
> +       g_ffmt.c   hexnan.c   strtoId.c  strtopd.c   strtordd.c
> +GDTOACFILES := $(patsubst %,gdtoa/%,$(GDTOACFILES))

A less brittle list of files?

GDTOAHFILES :=                                                  \
        gdtoa/arith.h $(shell gzip -dc gdtoa.tgz | tar tf - | grep
'gdtoa/[^/]*\.h$$')
GDTOACFILES :=                                                  \
        $(filter-out gdtoa/arithchk.c,$(shell gzip -dc gdtoa.tgz | tar
tf - | grep 'gdtoa/[^/]*\.c$$'))



More information about the MLton mailing list