diff options
Diffstat (limited to 'lang/mlton/files/patch-runtime-Makefile')
| -rw-r--r-- | lang/mlton/files/patch-runtime-Makefile | 71 |
1 files changed, 27 insertions, 44 deletions
diff --git a/lang/mlton/files/patch-runtime-Makefile b/lang/mlton/files/patch-runtime-Makefile index 4c4ed2be0b86..c0ec8cd04ca4 100644 --- a/lang/mlton/files/patch-runtime-Makefile +++ b/lang/mlton/files/patch-runtime-Makefile @@ -1,7 +1,7 @@ ---- runtime/Makefile.orig 2007-08-27 07:03:54.000000000 +1000 -+++ runtime/Makefile 2008-04-28 10:19:06.000000000 +1000 -@@ -11,11 +11,24 @@ - TARGET := self +--- runtime/Makefile.orig 2010-06-11 06:35:14.000000000 -0700 ++++ runtime/Makefile 2013-03-06 19:55:56.000000000 -0800 +@@ -23,6 +23,19 @@ + TARGET_ARCH := $(shell ../bin/host-arch) TARGET_OS := $(shell ../bin/host-os) + @@ -18,67 +18,50 @@ +endif + GCC_MAJOR_VERSION := \ -- $(shell gcc -v 2>&1 | grep 'gcc version' | \ -+ $(shell $(GCC) -v 2>&1 | grep 'gcc version' | \ + $(shell $(CC) -v 2>&1 | grep 'gcc version' | \ sed 's/.*gcc version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/') - GCC_MINOR_VERSION := \ -- $(shell gcc -v 2>&1 | grep 'gcc version' | \ -+ $(shell $(GCC) -v 2>&1 | grep 'gcc version' | \ - sed 's/.*gcc version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/') - GCC_VERSION := $(GCC_MAJOR_VERSION).$(GCC_MINOR_VERSION) - -@@ -96,10 +109,9 @@ - else - AR := $(TARGET)-ar rc - RANLIB := $(TARGET)-ranlib --FLAGS += -b $(TARGET) - endif - --CC := gcc -std=gnu99 -+CC := $(GCC) -std=gnu99 - CPPFLAGS := - CFLAGS := -I. -Iplatform $(FLAGS) - OPTCFLAGS := $(CFLAGS) $(CPPFLAGS) $(OPTFLAGS) -@@ -247,7 +259,7 @@ - cd gdtoa && $(CC) -o arithchk.out arithchk.c +@@ -292,7 +305,7 @@ + cd gdtoa && $(CC) $(OPTCFLAGS) $(OPTWARNCFLAGS) -w -O1 -o arithchk.out arithchk.c gdtoa/arith.h: gdtoa/arithchk.out - cd gdtoa && ./arithchk.out >arith.h + cd gdtoa && $(RUN) ./arithchk.out >arith.h - libmlton.a: $(OBJS) - $(AR) libmlton.a $(OBJS) -@@ -265,7 +277,7 @@ - gen/c-types.h gen/c-types.sml gen/ml-types.h: gen/gen-types.c util.h util.o + gdtoa/%-pic.o: gdtoa/%.c gdtoa/arith.h + $(CC) $(PICCFLAGS) $(PICWARNCFLAGS) -w -DINFNAN_CHECK -c -o $@ $< +@@ -322,7 +335,7 @@ + gen/gen-types.stamp: gen/gen-types.c util.h util.o $(CC) $(OPTCFLAGS) $(WARNCFLAGS) -o gen/gen-types gen/gen-types.c util.o - rm -f gen/c-types.h gen/c-types.sml gen/ml-types.h + rm -f gen/c-types.h gen/c-types.sml gen/ml-types.h gen/gen-types.stamp - cd gen && ./gen-types + cd gen && $(RUN) ./gen-types - rm -f gen/gen-types$(EXE) + rm -f gen/gen-types$(EXE) gen/gen-types + touch $@ - c-types.h ml-types.h: gen/c-types.h gen/ml-types.h -@@ -276,7 +288,7 @@ - gen/basis-ffi.h gen/basis-ffi.sml: gen/gen-basis-ffi.sml gen/basis-ffi.def +@@ -333,7 +346,7 @@ + gen/gen-basis-ffi.stamp: gen/gen-basis-ffi.sml gen/basis-ffi.def mlton -output gen/gen-basis-ffi gen/gen-basis-ffi.sml - rm -f gen/basis-ffi.h gen/basis-ffi.sml + rm -f gen/basis-ffi.h gen/basis-ffi.sml gen/gen-basis-ffi.stamp - cd gen && ./gen-basis-ffi + cd gen && $(RUN) ./gen-basis-ffi rm -f gen/gen-basis-ffi + touch $@ - basis-ffi.h: gen/basis-ffi.h -@@ -286,13 +298,13 @@ - gen/sizes: gen/gen-sizes.c libmlton.a - $(CC) $(OPTCFLAGS) $(WARNCFLAGS) -o gen/gen-sizes -I. -L. -lmlton gen/gen-sizes.c util.o +@@ -342,7 +355,7 @@ + gen/gen-sizes.stamp: gen/gen-sizes.c libmlton.a $(HFILES) + $(CC) $(OPTCFLAGS) $(WARNCFLAGS) -I. -o gen/gen-sizes gen/gen-sizes.c -L. -lmlton rm -f gen/sizes - cd gen && ./gen-sizes + cd gen && $(RUN) ./gen-sizes - rm -f gen/gen-sizes$(EXE) + rm -f gen/gen-sizes$(EXE) gen/gen-sizes + touch $@ - bytecode/opcodes: bytecode/print-opcodes.c bytecode/opcode.h +@@ -370,7 +383,7 @@ + bytecode/print-opcodes: bytecode/print-opcodes.c bytecode/opcode.h $(HFILES) $(CC) $(OPTCFLAGS) $(WARNCFLAGS) -o bytecode/print-opcodes bytecode/print-opcodes.c rm -f bytecode/opcodes - cd bytecode && ./print-opcodes > opcodes + cd bytecode && $(RUN) ./print-opcodes > opcodes - rm -f bytecode/print-opcodes$(EXE) - + basis.c: $(BASISCFILES) + rm -f basis.c |