diff options
| author | John-Mark Bell <jmb@netsurf-browser.org> | 2022-06-03 03:11:11 +0100 |
|---|---|---|
| committer | John-Mark Bell <jmb@netsurf-browser.org> | 2022-06-03 03:11:55 +0100 |
| commit | cd76c45e9ec422b63929ab386758b651df73ca45 (patch) | |
| tree | de96d962ed7e154505fbb88900bb051de277c6ec /Makefile | |
| parent | 926c0985e3cf6b025c37a0f16e69461051214eb1 (diff) | |
| download | netsurf-cd76c45e9ec422b63929ab386758b651df73ca45.tar.gz netsurf-cd76c45e9ec422b63929ab386758b651df73ca45.tar.bz2 | |
Buildsystem: fix makefile snafu
99012dcd introduced a regression that caused builds for all
non-RISC OS platforms to fail. Fix this, ensuring that RISC OS
builds still do the things they need to.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -329,12 +329,17 @@ IFLAGS = $(addprefix -I,$(INCLUDE_DIRS)) $(EXETARGET): $(OBJECTS) $(RESOURCES) $(MESSAGES) tools/linktrace-to-depfile.pl $(VQ)echo " LINK: $(EXETARGET)" -ifeq ($(TARGET)$(SUBTARGET),riscos-aof) +ifneq ($(TARGET),riscos) $(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS) > $(DEPROOT)/link-raw.d else + @# RISC OS targets are a bit special: we need to convert ELF -> AIF + ifeq ($(SUBTARGET),riscos-aof) + $(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS) > $(DEPROOT)/link-raw.d + else $(Q)$(CXX) -o $(EXETARGET:,ff8=,e1f) $(OBJECTS) $(LDFLAGS) > $(DEPROOT)/link-raw.d $(Q)$(ELF2AIF) $(EXETARGET:,ff8=,e1f) $(EXETARGET) $(Q)$(RM) $(EXETARGET:,ff8=,e1f) + endif endif $(VQ)echo "LINKDEPS: $(EXETARGET)" $(Q)echo -n "$(EXETARGET) $(DEPROOT)/link.d: " > $(DEPROOT)/link.d |