diff options
| author | Forrest Voight <forrest@forre.st> | 2020-04-24 12:01:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 19:01:32 +0200 |
| commit | 43263a95f862d1ffb27f8d9f8ce463fab65bb551 (patch) | |
| tree | 475681e3b7012cdf55cddd00ee5ffa1d17ee33d7 /src/grt | |
| parent | a4e7fd3e6286b24350d9c4a782cdba15cb081a9c (diff) | |
| download | ghdl-43263a95f862d1ffb27f8d9f8ce463fab65bb551.tar.gz ghdl-43263a95f862d1ffb27f8d9f8ce463fab65bb551.tar.bz2 ghdl-43263a95f862d1ffb27f8d9f8ce463fab65bb551.zip | |
Makefiles: fixed race condition in creation of "grt" directory before main.o is put in it (#1260)
Diffstat (limited to 'src/grt')
| -rw-r--r-- | src/grt/Makefile.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/grt/Makefile.inc b/src/grt/Makefile.inc index b3b9628e3..fc87a8859 100644 --- a/src/grt/Makefile.inc +++ b/src/grt/Makefile.inc @@ -139,21 +139,21 @@ $(libdirsuffix)/libgrt.a: $(GRT_ADD_OBJS) grt/run-bind.o grt/main.o grt/grt-file $(GRT_RANLIB) $@ grt/run-bind.adb: grt $(GRT_SRC_DEPS) grt-force - cd grt; $(MSYS2_ARG) $(GNATMAKE) -c -aI$(GRTSRCDIR) -aI.. \ + cd grt && $(MSYS2_ARG) $(GNATMAKE) -c -aI$(GRTSRCDIR) -aI.. \ $(GRT_PRAGMA_FLAG) ghdl_main $(GRT_ADAFLAGS) -cargs $(GRT_FLAGS) # Set No Run-Time flag to suppress references to standard gnat library. sed -e '/^P /s/P /P NR /' < grt/ghdl_main.ali > grt/ghdl_main-tmp.ali $(MV) grt/ghdl_main-tmp.ali grt/ghdl_main.ali - cd grt; $(GNATMAKE) -b ghdl_main.ali -bargs -Lgrt_ -o run-bind.adb -n + cd grt && $(GNATMAKE) -b ghdl_main.ali -bargs -Lgrt_ -o run-bind.adb -n grt: mkdir grt -grt/run-bind.o: grt/run-bind.adb - cd grt; $(MSYS2_ARG) $(GRT_ADACOMPILE) -o run-bind.o run-bind.adb +grt/run-bind.o: grt grt/run-bind.adb + cd grt && $(MSYS2_ARG) $(GRT_ADACOMPILE) -o run-bind.o run-bind.adb -grt/main.o: $(GRTSRCDIR)/main.adb - cd grt; $(MSYS2_ARG) $(GRT_ADACOMPILE) -o main.o $< -Igrt +grt/main.o: grt $(GRTSRCDIR)/main.adb + cd grt && $(MSYS2_ARG) $(GRT_ADACOMPILE) -o main.o $(GRTSRCDIR)/main.adb -Igrt GRT_C_COMPILE = $(CC) -c $(GRT_FLAGS) -o $@ $< GRT_C_COMPILE_PIC = $(CC) -c $(GRT_FLAGS) $(PIC_FLAGS) -o $@ $< |