Skip to content

Commit ae63cbe

Browse files
fingolfintecosaur
authored andcommitted
Add debug variant of loader_trampolines.o (JuliaLang#53437)
This prevents a race condition when building 'julia-cli-debug julia-cli-release' simultaneously (as we do for libjulia_jll, and also generally seems appropriate given what is done for all other source files. Motivated by JuliaPackaging/Yggdrasil#8151 so I'll first see if it works there. Closes JuliaLang#45002.
1 parent 2419413 commit ae63cbe

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

cli/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ LIB_DOBJS := $(BUILDDIR)/loader_lib.dbg.obj
4848
# If this is an architecture that supports dynamic linking, link in a trampoline definition
4949
ifneq (,$(wildcard $(SRCDIR)/trampolines/trampolines_$(ARCH).S))
5050
LIB_OBJS += $(BUILDDIR)/loader_trampolines.o
51-
LIB_DOBJS += $(BUILDDIR)/loader_trampolines.o
51+
LIB_DOBJS += $(BUILDDIR)/loader_trampolines.dbg.obj
5252
endif
5353

5454
default: release
@@ -65,6 +65,8 @@ $(BUILDDIR)/loader_exe.dbg.obj : $(SRCDIR)/loader_exe.c $(HEADERS) $(JULIAHOME)/
6565
@$(call PRINT_CC, $(CC) $(DEBUGFLAGS) $(LOADER_CFLAGS) -c $< -o $@)
6666
$(BUILDDIR)/loader_trampolines.o : $(SRCDIR)/trampolines/trampolines_$(ARCH).S $(HEADERS) $(SRCDIR)/trampolines/common.h
6767
@$(call PRINT_CC, $(CC) $(SHIPFLAGS) $(LOADER_CFLAGS) $< -c -o $@)
68+
$(BUILDDIR)/loader_trampolines.dbg.obj : $(SRCDIR)/trampolines/trampolines_$(ARCH).S $(HEADERS) $(SRCDIR)/trampolines/common.h
69+
@$(call PRINT_CC, $(CC) $(DEBUGFLAGS) $(LOADER_CFLAGS) $< -c -o $@)
6870

6971
# Debugging target to help us see what kind of code is being generated for our trampolines
7072
dump-trampolines: $(SRCDIR)/trampolines/trampolines_$(ARCH).S

0 commit comments

Comments
 (0)