mirror of
https://github.com/netsurf-browser/netsurf
synced 2024-12-23 12:36:51 +03:00
Thinly paper over gaping holes in the build system.
svn path=/trunk/netsurf/; revision=3788
This commit is contained in:
parent
78d194cb77
commit
9c93407fce
8
makefile
8
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)
|
||||
|
||||
|
6
posix.mk
6
posix.mk
@ -6,6 +6,12 @@ CC_DEBUG = /usr/bin/gcc
|
||||
CC = $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
|
||||
ASM = $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
|
||||
|
||||
# If it's blank, then no cross-compiler was found. Set it to something sane.
|
||||
ifeq ($(CC),)
|
||||
CC = $(GCCSDK_INSTALL_CROSSBIN)/gcc
|
||||
ASM = $(GCCSDK_INSTALL_CROSSBIN)/gcc
|
||||
endif
|
||||
|
||||
PLATFORM_CFLAGS_RISCOS = -I$(GCCSDK_INSTALL_ENV)/include \
|
||||
-I$(GCCSDK_INSTALL_ENV)/include/libxml2 \
|
||||
-I$(GCCSDK_INSTALL_ENV)/include/libmng \
|
||||
|
Loading…
Reference in New Issue
Block a user