thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALL: Mark link commands as make recursive

Browse source 
With this make gives access to its jobserver for linker which will use
it when linking with -flto=jobserver
This commit is contained in:
Le Philousophe 2021-01-10 11:14:30 +01:00 • committed by Eugene Sandulenko
parent 72c464bf11
commit 51e174f202
9 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.common
View file

@ -123,7 +123,7 @@ endif
# The build rule for the ScummVM executable # The build rule for the ScummVM executable
$(EXECUTABLE): $(DETECT_OBJS) $(OBJS) $(EXECUTABLE): $(DETECT_OBJS) $(OBJS)
$(QUIET_LINK)$(LD) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@ +$(QUIET_LINK)$(LD) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@
ifdef SPLIT_DWARF ifdef SPLIT_DWARF
$(EXECUTABLE).dwp: $(EXECUTABLE) $(EXECUTABLE).dwp: $(EXECUTABLE)

2
backends/platform/ds/arm7/Makefile
View file

@ -156,7 +156,7 @@ $(OUTPUT).elf : $(OFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
%.elf: %.elf:
echo ELF echo ELF
$(LD) $(LDFLAGS) -specs=ds_arm7.specs $(OFILES) $(LIBPATHS) $(LIBS) -o $(TARGET).elf +$(LD) $(LDFLAGS) -specs=ds_arm7.specs $(OFILES) $(LIBPATHS) $(LIBS) -o $(TARGET).elf

2
backends/platform/ds/ds.mk
View file

@ -207,7 +207,7 @@ $(ndsdir)/arm7/source/main.o: CPPFLAGS=
$(ndsdir)/arm7/arm7.elf: \ $(ndsdir)/arm7/arm7.elf: \
$(ndsdir)/arm7/source/libcartreset/cartreset.o \ $(ndsdir)/arm7/source/libcartreset/cartreset.o \
$(ndsdir)/arm7/source/main.o $(ndsdir)/arm7/source/main.o
$(LD) $(ARM7_LDFLAGS) -specs=ds_arm7.specs $+ -L$(DEVKITPRO)/libnds/lib -lnds7 -o $@ +$(LD) $(ARM7_LDFLAGS) -specs=ds_arm7.specs $+ -L$(DEVKITPRO)/libnds/lib -lnds7 -o $@

2
backends/platform/n64/Makefile
View file

@ -80,7 +80,7 @@ ROMFS.img:
genromfs -f ./ROMFS.img -d ./ROMFS -V romtest genromfs -f ./ROMFS.img -d ./ROMFS -V romtest
$(TARGET).elf: $(OBJS) $(TARGET).elf: $(OBJS)
$(LD) -o $(TARGET).elf $(OBJS) $(LDFLAGS) +$(LD) -o $(TARGET).elf $(OBJS) $(LDFLAGS)
$(TARGET).bin : $(TARGET).elf $(TARGET).bin : $(TARGET).elf
$(OBJCOPY) $(TARGET).elf $(TARGET).bin -O binary $(OBJCOPY) $(TARGET).elf $(TARGET).bin -O binary

2
backends/platform/psp/Makefile
View file

@ -173,7 +173,7 @@ LDFLAGS += -Wl,-T../../plugins/psp/main_prog.ld
all: $(PSP_EBOOT) all: $(PSP_EBOOT)
$(TARGET).elf: $(OBJS) $(TARGET).elf: $(OBJS)
$(LD) $(PRE_OBJS_FLAGS) $(OBJS) $(POST_OBJS_FLAGS) $(LDFLAGS) $(LIBS) -o $@ +$(LD) $(PRE_OBJS_FLAGS) $(OBJS) $(POST_OBJS_FLAGS) $(LDFLAGS) $(LIBS) -o $@
cp $(TARGET).elf $(TARGET).org.elf cp $(TARGET).elf $(TARGET).org.elf
$(FIXUP) $@ $(FIXUP) $@

6
devtools/module.mk
View file

@ -34,15 +34,15 @@ clean-devtools:
devtools/convbdf$(EXEEXT): $(srcdir)/devtools/convbdf.cpp devtools/convbdf$(EXEEXT): $(srcdir)/devtools/convbdf.cpp
$(QUIET)$(MKDIR) devtools/$(DEPDIR) $(QUIET)$(MKDIR) devtools/$(DEPDIR)
$(QUIET_LINK)$(LD) $(CXXFLAGS) -Wall -o $@ $< +$(QUIET_LINK)$(LD) $(CXXFLAGS) -Wall -o $@ $<
devtools/md5table$(EXEEXT): $(srcdir)/devtools/md5table.c devtools/md5table$(EXEEXT): $(srcdir)/devtools/md5table.c
$(QUIET)$(MKDIR) devtools/$(DEPDIR) $(QUIET)$(MKDIR) devtools/$(DEPDIR)
$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $< +$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $<
devtools/make-scumm-fontdata$(EXEEXT): $(srcdir)/devtools/make-scumm-fontdata.c devtools/make-scumm-fontdata$(EXEEXT): $(srcdir)/devtools/make-scumm-fontdata.c
$(QUIET)$(MKDIR) devtools/$(DEPDIR) $(QUIET)$(MKDIR) devtools/$(DEPDIR)
$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $< +$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $<
# Rule to explicitly rebuild the wwwroot archive # Rule to explicitly rebuild the wwwroot archive
wwwroot: wwwroot:

4
ports.mk
View file

@ -470,14 +470,14 @@ endif
# We use -force_cpusubtype_ALL to ensure the binary runs on every # We use -force_cpusubtype_ALL to ensure the binary runs on every
# PowerPC machine. # PowerPC machine.
scummvm-static: $(DETECT_OBJS) $(OBJS) scummvm-static: $(DETECT_OBJS) $(OBJS)
$(LD) $(LDFLAGS) -force_cpusubtype_ALL -o scummvm-static $(DETECT_OBJS) $(OBJS) \ +$(LD) $(LDFLAGS) -force_cpusubtype_ALL -o scummvm-static $(DETECT_OBJS) $(OBJS) \
-framework CoreMIDI \ -framework CoreMIDI \
$(OSX_STATIC_LIBS) \ $(OSX_STATIC_LIBS) \
$(OSX_ZLIB) $(OSX_ZLIB)
# Special target to create a static linked binary for the iPhone (legacy, and iOS 7+) # Special target to create a static linked binary for the iPhone (legacy, and iOS 7+)
iphone: $(DETECT_OBJS) $(OBJS) iphone: $(DETECT_OBJS) $(OBJS)
$(LD) $(LDFLAGS) -o scummvm $(DETECT_OBJS) $(OBJS) \ +$(LD) $(LDFLAGS) -o scummvm $(DETECT_OBJS) $(OBJS) \
$(OSX_STATIC_LIBS) \ $(OSX_STATIC_LIBS) \
-framework UIKit -framework CoreGraphics -framework OpenGLES \ -framework UIKit -framework CoreGraphics -framework OpenGLES \
-framework CoreFoundation -framework QuartzCore -framework Foundation \ -framework CoreFoundation -framework QuartzCore -framework Foundation \

4
rules.mk
View file

@ -25,7 +25,7 @@ TOOL_LIBS-$(TOOL-$(MODULE)) := $(TOOL_LIBS)
TOOL_CFLAGS-$(TOOL-$(MODULE)) := $(TOOL_CFLAGS) TOOL_CFLAGS-$(TOOL-$(MODULE)) := $(TOOL_CFLAGS)
$(TOOL-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(TOOL_DEPS) $(TOOL-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(TOOL_DEPS)
$(QUIET_LINK)$(LD) $(LDFLAGS) $(TOOL_CFLAGS-$@) $+ $(TOOL_LIBS-$@) -o $@ +$(QUIET_LINK)$(LD) $(LDFLAGS) $(TOOL_CFLAGS-$@) $+ $(TOOL_LIBS-$@) -o $@
# Reset TOOL_* vars # Reset TOOL_* vars
TOOL_EXECUTABLE:= TOOL_EXECUTABLE:=
@ -48,7 +48,7 @@ ifdef PLUGIN
PLUGIN-$(MODULE) := plugins/$(PLUGIN_PREFIX)$(notdir $(MODULE))$(PLUGIN_SUFFIX) PLUGIN-$(MODULE) := plugins/$(PLUGIN_PREFIX)$(notdir $(MODULE))$(PLUGIN_SUFFIX)
$(PLUGIN-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(PLUGIN_EXTRA_DEPS) $(PLUGIN-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(PLUGIN_EXTRA_DEPS)
$(QUIET)$(MKDIR) plugins $(QUIET)$(MKDIR) plugins
$(QUIET_PLUGIN)$(LD) $(SAVED_LDFLAGS) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) $(PLUGIN_LDFLAGS) -o $@ +$(QUIET_PLUGIN)$(LD) $(SAVED_LDFLAGS) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) $(PLUGIN_LDFLAGS) -o $@
# Reset PLUGIN var # Reset PLUGIN var
PLUGIN:= PLUGIN:=

2
test/module.mk
View file

@ -71,7 +71,7 @@ endif
test: test/runner test: test/runner
./test/runner ./test/runner
test/runner: test/runner.cpp $(TEST_LIBS) copy-dat test/runner: test/runner.cpp $(TEST_LIBS) copy-dat
$(QUIET_CXX)$(LD) $(TEST_CXXFLAGS) $(CPPFLAGS) $(TEST_CFLAGS) -o $@ test/runner.cpp $(TEST_LIBS) $(TEST_LDFLAGS) +$(QUIET_CXX)$(LD) $(TEST_CXXFLAGS) $(CPPFLAGS) $(TEST_CFLAGS) -o $@ test/runner.cpp $(TEST_LIBS) $(TEST_LDFLAGS)
test/runner.cpp: $(TESTS) test/runner.cpp: $(TESTS)
@mkdir -p test @mkdir -p test
$(srcdir)/test/cxxtest/cxxtestgen.py $(TEST_FLAGS) -o $@ $+ $(srcdir)/test/cxxtest/cxxtestgen.py $(TEST_FLAGS) -o $@ $+