diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2008-03-19 03:25:05 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2008-03-19 03:25:05 +0000 |
| commit | 71be1d1ed87573294a6083556b63e206bf5662e0 (patch) | |
| tree | c4eae40419e10d99612d3075a01c346a8c9cc530 | |
| parent | 4162fb9a82c427ab2f2b73fc63cbb40cdd3f6629 (diff) | |
| download | netsurf-71be1d1ed87573294a6083556b63e206bf5662e0.tar.gz netsurf-71be1d1ed87573294a6083556b63e206bf5662e0.tar.bz2 | |
Minor tweaks to Makefile for successful compilation on RO.
Document the s/$(shell uname -s)/riscos/ kludge until we get a fixed version of UnixLib/make
svn path=/trunk/netsurf/; revision=3969
| -rw-r--r-- | Makefile.sources | 2 | ||||
| -rw-r--r-- | Makefile.unix | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/Makefile.sources b/Makefile.sources index ed6968086..0bd3a21cf 100644 --- a/Makefile.sources +++ b/Makefile.sources @@ -104,7 +104,7 @@ CLEANS += clean-intermediates ifeq ($(TARGET),riscos) SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_RISCOS) -EXETARGET := !NetSurf/!RunImage,ff8 +EXETARGET := !NetSurf/!RunImage$(EXEEXT) endif ifeq ($(TARGET),gtk) diff --git a/Makefile.unix b/Makefile.unix index b7d35750d..e59163f71 100644 --- a/Makefile.unix +++ b/Makefile.unix @@ -11,8 +11,8 @@ # make -f Makefile.unix TARGET=riscos # to cross-build for RO. # -# Thus-far only tested on unix platforms. on RO in theory it ought to -# work as per the native build. +# Tested on unix platforms (building for GTK and cross-compiling for RO) and +# on RO (building for RO). # # To clean, invoke as above, with the 'clean' target # @@ -24,6 +24,12 @@ all: all-program # Determine host type +# NOTE: Currently, this is broken on RISC OS due to what appear to +# be bugs in UnixLib's pipe()/dup2() implementations. Until these +# are fixed and a new build of make is available, manually hardcode +# this to "riscos" (sans quotes). Please remember to change it back +# to "$(shell uname -s)" (sans quotes) again before committing any +# Makefile changes. HOST := $(shell uname -s) ifeq ($(HOST),riscos) @@ -66,9 +72,11 @@ ifeq ($(TARGET),riscos) ifeq ($(HOST),riscos) # Build for RO on RO CC := gcc +EXEEXT := else # Cross-build for RO CC := /home/riscos/cross/bin/gcc +EXEEXT := ,ff8 endif STARTGROUP := ENDGROUP := |