Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/cd76c45e9ec422b63929ab386758b651df73ca45
...commit
http://git.netsurf-browser.org/netsurf.git/commit/cd76c45e9ec422b63929ab386758b651df73ca45
...tree
http://git.netsurf-browser.org/netsurf.git/tree/cd76c45e9ec422b63929ab386758b651df73ca45
The branch, master has been updated
via cd76c45e9ec422b63929ab386758b651df73ca45 (commit)
from 926c0985e3cf6b025c37a0f16e69461051214eb1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=cd76c45e9ec422b63929ab386758b651df73ca45
commit cd76c45e9ec422b63929ab386758b651df73ca45
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
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.
diff --git a/Makefile b/Makefile
index 4fe124d..f66f796 100644
--- a/Makefile
+++ b/Makefile
@@ -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
-----------------------------------------------------------------------
Summary of changes:
Makefile | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 4fe124d..f66f796 100644
--- a/Makefile
+++ b/Makefile
@@ -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
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
