Skip to content

Commit 5d971b9

Browse files
fingolfinKristofferC
authored andcommitted
Add debug variant of loader_trampolines.o (#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 #45002. (cherry picked from commit fee198b)
1 parent 7bfd9f4 commit 5d971b9

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

cli/Makefile

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

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

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

0 commit comments

Comments
 (0)