diff options
author | Ashish Gupta <ashmew2@gmail.com> | 2017-05-15 22:38:30 +0200 |
---|---|---|
committer | Ashish Gupta <ashmew2@gmail.com> | 2017-05-15 22:38:30 +0200 |
commit | 808f17e02fca0edfff0037759053ef25578833b5 (patch) | |
tree | 011ada8347da6d90ff807ea1a568da9a55eee997 | |
parent | 121eac04430b85ce557fb1762204b1b43257f996 (diff) | |
download | buildsystem-808f17e02fca0edfff0037759053ef25578833b5.tar.gz buildsystem-808f17e02fca0edfff0037759053ef25578833b5.tar.bz2 |
use cross and env for kolibrios
-rw-r--r-- | makefiles/Makefile.tools | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools index 6eb48a8..654889d 100644 --- a/makefiles/Makefile.tools +++ b/makefiles/Makefile.tools @@ -56,11 +56,14 @@ NSTESTTOOLS := $(NSSHARED)/testtools ############################################################################### ifeq ($(HOST),kolibrios) - BUILD_CC := kos32-gcc - CC := kos32-gcc - AR := kos32-ar + CROSSDIR := /opt/netsurf/kos32-gcc/cross/autobuild/tools/win32/bin + ENVDIR := /opt/netsurf/kos32-gcc/env/ + BUILD_CC := $(CROSSDIR)/kos32-gcc + CC := $(CROSSDIR)/kos32-gcc + AR := $(CROSSDIR)/kos32-ar BUILD := Linux - PREFIX ?= /opt/netsurf + PREFIX := /opt/netsurf/kos32-gcc/env + KOLIBRI_SVN_CHECKOUT ?= /opt/netsurf/kos32-gcc/env/kolibrios else BUILD_CC ?= cc endif @@ -260,18 +263,17 @@ else endif ifeq ($(HOST),kolibrios) - KOLIBRI_SVN_CHECKOUT := $(HOME)/kolibrios KOL_LIBC_MAIN := $(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/newlib/libc/include KOL_LIBC_MACHINE := $(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/newlib/libc/include/machine KOL_LIBC_INCLUDES := -I$(KOL_LIBC_MAIN) -I$(KOL_LIBC_MACHINE) - KOL_NS_DEP_INCLUDES := -I$(KOLIBRI_SVN_CHECKOUT/contrib/sdk/sources/expat/lib + KOL_NS_DEP_INCLUDES := -I$(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/expat/lib KOL_LIB_DIR := $(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/lib LIB_LDFLAGS := -L$(KOL_LIB_DIR) -lfreetype OS_LDFLAGS := -static -S -Tstatic.lds --image-base 0 - NS_INCLUDE := $(PREFIX)/include - NS_LIB_LDFLAGS := -L$(PREFIX)/lib/ -lnsbmp -lnsutils -lwapcaplet -lsvgtiny -lnsgif -lutf8proc -lcss -lnsfb -lparserutils -ldom -lhubbub -lz -lexpat + NS_INCLUDE := $(ENVDIR)/include + NS_LIB_LDFLAGS := -L$(ENVDIR)/lib/ -lnsbmp -lnsutils -lwapcaplet -lsvgtiny -lnsgif -lutf8proc -lcss -lnsfb -lparserutils -ldom -lhubbub -lz -lexpat WARN_SUPPRESS := -Wno-undef -Wno-redundant-decls -Wno-char-subscripts -Wno-undef -Wno-implicit-function-declaration -Wno-int-conversion -Wno-nested-externs -Wno-format-extra-args -Wno-format -Wno-pedantic ERROR_SUPPRESS := -Wno-error=pedantic |