From cac0ef9a24be2f731488d38870832e36c73b84b0 Mon Sep 17 00:00:00 2001 From: Norayr Chilingarian Date: Fri, 18 Oct 2013 19:05:05 +0400 Subject: [PATCH] improved makefiles, now it's easier to build a compiler. Former-commit-id: 08c4a44059d19e323273a9098a84de47193e498d --- COMPILE | 2 +- makefile | 2 +- makefile.gnuc.armv6j | 4 ++-- makefile.gnuc.armv6j_hardfp | 4 ++-- makefile.gnuc.armv7a_hardfp | 4 ++-- makefile.gnuc.x86 | 4 ++-- makefile.gnuc.x86_64 | 2 +- vocstatic.linux.gnuc.x86.REMOVED.git-id | 2 +- vocstatic.linux.gnuc.x86_64.REMOVED.git-id | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/COMPILE b/COMPILE index 1e499a6b..a60eb46c 100644 --- a/COMPILE +++ b/COMPILE @@ -1,6 +1,6 @@ currently three bootstrap static binaries provided, for x86_64, x86, and armv6j_hardfp (works on raspberry pi) gnu/linux targets. -0) +0) (* NOT NECESSARY ANYMORE *) copy statically compiled voc compiler for your platform as vocstatic. for instance, if your platform is armv6j_hardfp (like raspberry pi) # cp vocstatic.linux.gnuc.armv6j_hardfp vocstatic diff --git a/makefile b/makefile index 475d19ab..1cce6d7a 100644 --- a/makefile +++ b/makefile @@ -12,7 +12,7 @@ INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH) SETPATH = CFLAGS=$(INCLUDEPATH) PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP):src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/coco:src/test VOC = voc -VOCSTATIC = $(SETPATH) ./vocstatic +VOCSTATIC = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) VOCPARAM = $(shell ./vocparam > voc.par) VERSION = GNU_Linux_$(TARCH) LIBNAME = VishapOberon diff --git a/makefile.gnuc.armv6j b/makefile.gnuc.armv6j index d88f9695..38132d60 100644 --- a/makefile.gnuc.armv6j +++ b/makefile.gnuc.armv6j @@ -12,7 +12,7 @@ INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH) SETPATH = CFLAGS=$(INCLUDEPATH) PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP):src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/coco:src/test VOC = voc -VOCSTATIC = $(SETPATH) ./vocstatic +VOCSTATIC = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) VOCPARAM = $(shell ./vocparam > voc.par) VERSION = GNU_Linux_$(TARCH) LIBNAME = VishapOberon @@ -135,7 +135,7 @@ stage6: $(VOCSTATIC) -sP oocLowReal.Mod oocLowLReal.Mod $(VOCSTATIC) -sP oocRealMath.Mod oocOakMath.Mod $(VOCSTATIC) -sP oocLRealMath.Mod - $(VOCSTATIC) -sP oocLongInts.Mod oocLRealConv.Mod oocLRealStr.Mod + $(VOCSTATIC) -sP oocLongInts.Mod oocLRealConv.Mod oocLRealStr.Mod $(VOCSTATIC) -sP oocwrapperlibc.Mod $(VOCSTATIC) -sP ulmSYSTEM.Mod $(VOCSTATIC) -sP ulmASCII.Mod ulmSets.Mod diff --git a/makefile.gnuc.armv6j_hardfp b/makefile.gnuc.armv6j_hardfp index c98d3dc0..0dbe1b41 100644 --- a/makefile.gnuc.armv6j_hardfp +++ b/makefile.gnuc.armv6j_hardfp @@ -12,7 +12,7 @@ INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH) SETPATH = CFLAGS=$(INCLUDEPATH) PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP):src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/coco:src/test VOC = voc -VOCSTATIC = $(SETPATH) ./vocstatic +VOCSTATIC = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) VOCPARAM = $(shell ./vocparam > voc.par) VERSION = GNU_Linux_$(TARCH) LIBNAME = VishapOberon @@ -135,7 +135,7 @@ stage6: $(VOCSTATIC) -sP oocLowReal.Mod oocLowLReal.Mod $(VOCSTATIC) -sP oocRealMath.Mod oocOakMath.Mod $(VOCSTATIC) -sP oocLRealMath.Mod - $(VOCSTATIC) -sP oocLongInts.Mod oocLRealConv.Mod oocLRealStr.Mod + $(VOCSTATIC) -sP oocLongInts.Mod oocLRealConv.Mod oocLRealStr.Mod $(VOCSTATIC) -sP oocwrapperlibc.Mod $(VOCSTATIC) -sP ulmSYSTEM.Mod $(VOCSTATIC) -sP ulmASCII.Mod ulmSets.Mod diff --git a/makefile.gnuc.armv7a_hardfp b/makefile.gnuc.armv7a_hardfp index af52b661..186d15ee 100644 --- a/makefile.gnuc.armv7a_hardfp +++ b/makefile.gnuc.armv7a_hardfp @@ -12,7 +12,7 @@ INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH) SETPATH = CFLAGS=$(INCLUDEPATH) PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP):src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/coco:src/test VOC = voc -VOCSTATIC = $(SETPATH) ./vocstatic +VOCSTATIC = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) VOCPARAM = $(shell ./vocparam > voc.par) VERSION = GNU_Linux_$(TARCH) LIBNAME = VishapOberon @@ -135,7 +135,7 @@ stage6: $(VOCSTATIC) -sP oocLowReal.Mod oocLowLReal.Mod $(VOCSTATIC) -sP oocRealMath.Mod oocOakMath.Mod $(VOCSTATIC) -sP oocLRealMath.Mod - $(VOCSTATIC) -sP oocLongInts.Mod oocLRealConv.Mod oocLRealStr.Mod + $(VOCSTATIC) -sP oocLongInts.Mod oocLRealConv.Mod oocLRealStr.Mod $(VOCSTATIC) -sP oocwrapperlibc.Mod $(VOCSTATIC) -sP ulmSYSTEM.Mod $(VOCSTATIC) -sP ulmASCII.Mod ulmSets.Mod diff --git a/makefile.gnuc.x86 b/makefile.gnuc.x86 index 6203ec3a..f6356fb8 100644 --- a/makefile.gnuc.x86 +++ b/makefile.gnuc.x86 @@ -12,7 +12,7 @@ INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH) SETPATH = CFLAGS=$(INCLUDEPATH) PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP):src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/coco:src/test VOC = voc -VOCSTATIC = $(SETPATH) ./vocstatic +VOCSTATIC = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) VOCPARAM = $(shell ./vocparam > voc.par) VERSION = GNU_Linux_$(TARCH) LIBNAME = VishapOberon @@ -135,7 +135,7 @@ stage6: $(VOCSTATIC) -sP oocLowReal.Mod oocLowLReal.Mod $(VOCSTATIC) -sP oocRealMath.Mod oocOakMath.Mod $(VOCSTATIC) -sP oocLRealMath.Mod - $(VOCSTATIC) -sP oocLongInts.Mod oocLRealConv.Mod oocLRealStr.Mod + $(VOCSTATIC) -sP oocLongInts.Mod oocLRealConv.Mod oocLRealStr.Mod $(VOCSTATIC) -sP oocwrapperlibc.Mod $(VOCSTATIC) -sP ulmSYSTEM.Mod $(VOCSTATIC) -sP ulmASCII.Mod ulmSets.Mod diff --git a/makefile.gnuc.x86_64 b/makefile.gnuc.x86_64 index 475d19ab..1cce6d7a 100644 --- a/makefile.gnuc.x86_64 +++ b/makefile.gnuc.x86_64 @@ -12,7 +12,7 @@ INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH) SETPATH = CFLAGS=$(INCLUDEPATH) PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP):src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/coco:src/test VOC = voc -VOCSTATIC = $(SETPATH) ./vocstatic +VOCSTATIC = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) VOCPARAM = $(shell ./vocparam > voc.par) VERSION = GNU_Linux_$(TARCH) LIBNAME = VishapOberon diff --git a/vocstatic.linux.gnuc.x86.REMOVED.git-id b/vocstatic.linux.gnuc.x86.REMOVED.git-id index 05efe14c..966019fd 100644 --- a/vocstatic.linux.gnuc.x86.REMOVED.git-id +++ b/vocstatic.linux.gnuc.x86.REMOVED.git-id @@ -1 +1 @@ -64a6ed58cd6473ff366ffc5cd8d4fb27e173448d \ No newline at end of file +5ff6a53fdf454f75922b12070ffd817ca5562dfe \ No newline at end of file diff --git a/vocstatic.linux.gnuc.x86_64.REMOVED.git-id b/vocstatic.linux.gnuc.x86_64.REMOVED.git-id index bda68376..a494cc2b 100644 --- a/vocstatic.linux.gnuc.x86_64.REMOVED.git-id +++ b/vocstatic.linux.gnuc.x86_64.REMOVED.git-id @@ -1 +1 @@ -7e50a6001dfae638682d5c84c73f327515cfcf01 \ No newline at end of file +eb7855c3da28b25bac66fa2b1632c6523dc6b801 \ No newline at end of file