diff options
| author | John-Mark Bell <jmb@netsurf-browser.org> | 2022-06-03 00:43:42 +0100 |
|---|---|---|
| committer | John-Mark Bell <jmb@netsurf-browser.org> | 2022-06-03 00:43:42 +0100 |
| commit | 99012dcdd43b916902e4aab839694e311a98f22b (patch) | |
| tree | d167fdefabcea073c49c5c088cf7e53e145c0770 /Makefile | |
| parent | c90fb03e58251b8798f1dfd0caaaf6ef6d4c9ff9 (diff) | |
| download | netsurf-99012dcdd43b916902e4aab839694e311a98f22b.tar.gz netsurf-99012dcdd43b916902e4aab839694e311a98f22b.tar.bz2 | |
Buildsystem: update for new RISC OS toolchain
The new toolchain has a different machine triplet, so update the
things that care about it to work either way.
Remove the expectation that ro-pkg-config exists (it's trivial
and the core buildsystem never used it, so let's have some
consistency).
Determine the location of the zip binary in Makefile.tools, just
like for all the other tooling and stop assuming where it's
installed in the netsurf.zip target.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -329,7 +329,7 @@ IFLAGS = $(addprefix -I,$(INCLUDE_DIRS)) $(EXETARGET): $(OBJECTS) $(RESOURCES) $(MESSAGES) tools/linktrace-to-depfile.pl $(VQ)echo " LINK: $(EXETARGET)" -ifneq ($(TARGET)$(SUBTARGET),riscos-elf) +ifeq ($(TARGET)$(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 |