diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 1995-05-04 11:48:01 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 1995-05-04 11:48:01 +0000 |
| commit | 1953de21ef74e21a814e5ea6323e25aae1ade520 (patch) | |
| tree | 26b3ac773e4d1ee2f39ac3f4a07b4f5f6266d83e | |
| parent | 61bd8ace6bdb2652f4d51d64e3239a7105f56c26 (diff) | |
Correction nom du header des executables
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | bytecomp/linker.ml | 2 | ||||
| -rw-r--r-- | stdlib/Makefile | 12 |
3 files changed, 15 insertions, 11 deletions
@@ -68,7 +68,7 @@ coldstart: cd yacc; $(MAKE) all cp yacc/camlyacc boot/camlyacc cd stdlib; $(MAKE) COMPILER=../boot/camlc all - cp stdlib/stdlib.cma stdlib/*.cmi stdlib/header.exe boot + cp stdlib/stdlib.cma stdlib/*.cmi stdlib/cslheader boot # Promote the newly compiled system to the rank of bootstrap compiler promote: @@ -77,12 +77,12 @@ promote: mkdir boot/Saved mv boot/Saved.prev boot/Saved/Saved.prev mv boot/camlrun boot/camlc boot/camllex boot/camlyacc boot/Saved - mv boot/*.cmi boot/stdlib.cma boot/header.exe boot/Saved + mv boot/*.cmi boot/stdlib.cma boot/cslheader boot/Saved cp byterun/camlrun boot/camlrun cp camlc boot/camlc cp lex/camllex boot/camllex cp yacc/camlyacc boot/camlyacc - cp stdlib/stdlib.cma stdlib/*.cmi stdlib/header.exe boot + cp stdlib/stdlib.cma stdlib/*.cmi stdlib/cslheader boot # Restore the saved bootstrap compiler if a problem arises restore: @@ -92,7 +92,7 @@ restore: # Check if fixpoint reached compare: - @if cmp -s boot/camlc camlc && cmp -s boot/camllex lex/camllex; \ + @if cmp boot/camlc camlc && cmp boot/camllex lex/camllex; \ then echo "Fixpoint reached, bootstrap succeeded."; \ else echo "Fixpoint not reached, try one more bootstrapping cycle."; \ fi @@ -100,6 +100,10 @@ compare: # Complete bootstrapping cycle bootstrap: promote clean all compare +# Remove old bootstrap compilers +cleanboot: + rm -rf boot/Saved/Saved.prev/* + # Installation install: test -d $(BINDIR) || mkdir $(BINDIR) diff --git a/bytecomp/linker.ml b/bytecomp/linker.ml index 93d5ae124..0ac4f2fa1 100644 --- a/bytecomp/linker.ml +++ b/bytecomp/linker.ml @@ -154,7 +154,7 @@ let link_bytecode objfiles exec_name copy_header = (* Copy the header *) if copy_header then begin try - let inchan = open_in_bin (find_in_path !load_path "header_exe") in + let inchan = open_in_bin (find_in_path !load_path "cslheader") in copy_file inchan outchan; close_in inchan with Not_found | Sys_error _ -> () diff --git a/stdlib/Makefile b/stdlib/Makefile index a00cd82b9..fe2f3687c 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -9,19 +9,19 @@ OBJS=pervasives.cmo string.cmo char.cmo list.cmo array.cmo sys.cmo \ baltree.cmo set.cmo stack.cmo queue.cmo \ printf.cmo format.cmo arg.cmo printexc.cmo gc.cmo -all: stdlib.cma header.exe +all: stdlib.cma cslheader install: - cp stdlib.cma *.cmi *.mli header.exe $(LIBDIR) + cp stdlib.cma *.cmi *.mli cslheader $(LIBDIR) stdlib.cma: $(OBJS) $(CAMLC) -a -o stdlib.cma $(OBJS) -header.exe: header.c ../Makefile.config +cslheader: header.c ../Makefile.config if $(SHARPBANGSCRIPTS); \ - then echo "#!$(BINDIR)/cslrun" > header.exe; \ - else $(CC) $(CCCOMPOPTS) $(CCLINKOPTS) header.c -o header.exe; \ - strip header.exe; fi + then echo "#!$(BINDIR)/cslrun" > cslheader; \ + else $(CC) $(CCCOMPOPTS) $(CCLINKOPTS) header.c -o cslheader; \ + strip cslheader; fi pervasives.cmi: pervasives.mli $(CAMLC) -nopervasives -c pervasives.mli |