summaryrefslogtreecommitdiff
path: root/makefile
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2008-01-28 01:46:29 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2008-01-28 01:46:29 +0000
commit9c93407fce4a566eecb1b65ae09b886987452b42 (patch)
tree4f1c7f184e6d264a596b82f7619e7b523d9b691d /makefile
parent78d194cb77db00a530779aa2a1e8d2ef9707d229 (diff)
downloadnetsurf-9c93407fce4a566eecb1b65ae09b886987452b42.tar.gz
netsurf-9c93407fce4a566eecb1b65ae09b886987452b42.tar.bz2
Thinly paper over gaping holes in the build system.
svn path=/trunk/netsurf/; revision=3788
Diffstat (limited to 'makefile')
-rw-r--r--makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/makefile b/makefile
index cd1224480..ec4941b84 100644
--- a/makefile
+++ b/makefile
@@ -72,12 +72,14 @@ OBJECTS_GTK += font_pango.o gtk_bitmap.o gtk_gui.o \
gtk_history.o gtk_window.o gtk_filetype.o \
gtk_download.o # gtk/
-
-OBJDIR_RISCOS = $(shell $(CC) -dumpmachine)
+# This makes me want to vomit, but is necessary to avoid a load of
+# "make: /home/riscos/cross/bin/gcc: Command not found." if there's no GCCSDK
+# installed on the build machine. The new build system can't happen soon enough
+OBJDIR_RISCOS = $(shell $(CC) -dumpmachine 2>/dev/null || echo arm-riscos-aof)
SOURCES_RISCOS=$(OBJECTS_RISCOS:.o=.c)
OBJS_RISCOS=$(OBJECTS_RISCOS:%.o=$(OBJDIR_RISCOS)/%.o)
-OBJDIR_RISCOS_SMALL = $(shell $(CC) -dumpmachine)-small
+OBJDIR_RISCOS_SMALL = $(OBJDIR_RISCOS)-small
SOURCES_RISCOS_SMALL=$(OBJECTS_RISCOS_SMALL:.o=.c)
OBJS_RISCOS_SMALL=$(OBJECTS_RISCOS_SMALL:%.o=$(OBJDIR_RISCOS_SMALL)/%.o)