diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2011-01-06 14:23:20 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2011-01-06 14:23:20 +0000 |
| commit | fa73e251202553a659fe557278464efc178ca896 (patch) | |
| tree | 3bf794cb34f8095494c9b66c16304b02c14e5db8 | |
| parent | f7a5e69ad5a467a1f7ce61d599ce620f9fe609aa (diff) | |
| download | ocaml-fa73e251202553a659fe557278464efc178ca896.tar.gz | |
PR#4243: make .c.p.o rule thread-safe
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10921 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | asmrun/.cvsignore | 3 | ||||
| -rw-r--r-- | asmrun/Makefile | 12 | ||||
| -rw-r--r-- | byterun/.cvsignore | 3 | ||||
| -rw-r--r-- | byterun/Makefile | 12 |
4 files changed, 14 insertions, 16 deletions
diff --git a/asmrun/.cvsignore b/asmrun/.cvsignore index b8ad3e1c18..5b8bed6859 100644 --- a/asmrun/.cvsignore +++ b/asmrun/.cvsignore @@ -1,3 +1,6 @@ +// svn propset -F .cvsignore svn:ignore . +*.p.c +*.d.c libasmrun.a libasmrunp.a main.c diff --git a/asmrun/Makefile b/asmrun/Makefile index 3e37ab1ea4..de8427a4d9 100644 --- a/asmrun/Makefile +++ b/asmrun/Makefile @@ -164,16 +164,12 @@ clean:: $(ASPP) -DSYS_$(SYSTEM) $(ASPPPROFFLAGS) -o $*.p.o $*.S .c.d.o: - @ if test -f $*.o; then mv $*.o $*.f.o; else :; fi - $(CC) -c $(DFLAGS) $< - mv $*.o $*.d.o - @ if test -f $*.f.o; then mv $*.f.o $*.o; else :; fi + ln -s -f $*.c $*.d.c + $(CC) -c $(DFLAGS) $*.d.c .c.p.o: - @ if test -f $*.o; then mv $*.o $*.f.o; else :; fi - $(CC) -c $(PFLAGS) $< - mv $*.o $*.p.o - @ if test -f $*.f.o; then mv $*.f.o $*.o; else :; fi + ln -s -f $*.c $*.p.c + $(CC) -c $(PFLAGS) $*.p.c .s.o: $(ASPP) -DSYS_$(SYSTEM) -o $*.o $*.s diff --git a/byterun/.cvsignore b/byterun/.cvsignore index 8873b77fb5..ceeaff4e84 100644 --- a/byterun/.cvsignore +++ b/byterun/.cvsignore @@ -1,3 +1,4 @@ +// svn propset -F .cvsignore svn:ignore . jumptbl.h primitives prims.c @@ -18,3 +19,5 @@ interp.a.lst *.so *.a .depend.nt +*.d.c +*.pic.c diff --git a/byterun/Makefile b/byterun/Makefile index 8ee62aee92..bcb49c9826 100644 --- a/byterun/Makefile +++ b/byterun/Makefile @@ -57,16 +57,12 @@ clean:: .SUFFIXES: .d.o .pic.o .c.d.o: - @ if test -f $*.o; then mv $*.o $*.f.o; else :; fi - $(CC) -c $(DFLAGS) $< - mv $*.o $*.d.o - @ if test -f $*.f.o; then mv $*.f.o $*.o; else :; fi + ln -s -f $*.c $*.d.c + $(CC) -c $(DFLAGS) $*.d.c .c.pic.o: - @ if test -f $*.o; then mv $*.o $*.f.o; else :; fi - $(CC) -c $(CFLAGS) $(SHAREDCCCOMPOPTS) $< - mv $*.o $*.pic.o - @ if test -f $*.f.o; then mv $*.f.o $*.o; else :; fi + ln -s -f $*.c $*.pic.c + $(CC) -c $(CFLAGS) $(SHAREDCCCOMPOPTS) $*.pic.c depend : prims.c opnames.h jumptbl.h version.h -gcc -MM $(BYTECCCOMPOPTS) *.c > .depend |