gnuc -> gcc, more abstraction in makefiles and extTools

Former-commit-id: 01664df2ee
This commit is contained in:
Norayr Chilingarian 2014-04-13 14:15:48 +04:00
parent 27cd609dad
commit b9bc8f2a39
79 changed files with 99 additions and 99 deletions

10
COMPILE
View file

@ -3,17 +3,17 @@ currently three bootstrap static binaries provided, for x86_64, x86, and armv6j_
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
# cp vocstatic.linux.gcc.armv6j_hardfp vocstatic
and if your platform is x86 (32bit) gnu/linux then
# cp vocstatic.linux.gnuc.x86 vocstatic
# cp vocstatic.linux.gcc.x86 vocstatic
and if it's x86_64 then do nothing or
# cp vocstatic.linux.gnuc.x86_64 vocstatic
# cp vocstatic.linux.gcc.x86_64 vocstatic
1) make with corresponding makefile
if it's rasp pi or other armhf platform then do
# make -f makefile.gnuc.armv6j_hardfp
# make -f makefile.gcc.armv6j_hardfp
if it's x86 then
# make -f makefile.gnuc.x86
# make -f makefile.gcc.x86
and if it's x86_64, then default makefile is for this platform
# make

4
hints
View file

@ -2,7 +2,7 @@
0) generate voc.par file for the target platform(if it's not exist in src/par).
you can do it by compiling vocparam, and running it as "./vocparam > voc.par"
1) generate voc, ocat, showdef source for target platform by running
make -f makefile.gnuc.<arch> port0
make -f makefile.gcc.<arch> port0
(or copy corresponding voc.par to the source directory yourself, remove stage2 from port0 section of the makefile, and run make port0)
2) transfer source to a target platform and write
make port1
@ -13,7 +13,7 @@
that's how I've done x86 port.
voc was originally run on x86_64.
notes** in practice everything is not always simple, because you may need to edit Unix.Mod, Args.Mod and SYSTEM.h, and put them to src/lib/system/gnuc/<yourtarget>, and create new makefile for your target.
notes** in practice everything is not always simple, because you may need to edit Unix.Mod, Args.Mod and SYSTEM.h, and put them to src/lib/system/gcc/<yourtarget>, and create new makefile for your target.
==how to add a new option==

View file

@ -3,7 +3,7 @@ BUILDID=$(shell date +%Y/%m/%d)
TOS = linux
TARCH = x86_64
#TARCH = x86 x86_64 armv6j armv6j_hardfp armv7a_hardfp powerpc
CCOMP = gnuc
CCOMP = gcc
RELEASE = 1.0
@ -26,10 +26,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
PREFIXLN = $(PRF)/voc
CCOPT = -fPIC $(INCLUDEPATH) -g
CC = cc $(CCOPT) -c
CL = cc $(CCOPT)
LD = cc -shared -lX11 -o $(LIBRARY).so
SHRLIBEXT = so
CC = $(CCOMP) $(CCOPT) -c
CL = $(CCOMP) $(CCOPT)
LD = $(CCOMP) -shared -lX11 -o $(LIBRARY).$(SHRLIBEXT)
# s is necessary to create index inside a archive
ARCHIVE = ar rcs $(LIBRARY).a
@ -272,7 +272,7 @@ clean:
rm *.sym
rm *.o
rm *.a
rm *.so
rm *.$(SHRLIBEXT)
install:
test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@ -287,7 +287,7 @@ install:
test -d $(PREFIX)/lib/voc/obj | mkdir -p $(PREFIX)/lib/voc/obj
test -d $(PREFIX)/lib/voc/sym | mkdir -p $(PREFIX)/lib/voc/sym
cp $(LIBRARY).so $(PREFIX)/lib
cp $(LIBRARY).$(SHRLIBEXT) $(PREFIX)/lib
cp $(LIBRARY).a $(PREFIX)/lib
cp *.c $(PREFIX)/lib/voc/obj/
cp *.h $(PREFIX)/lib/voc/obj/

View file

@ -27,10 +27,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
PREFIXLN = $(PRF)/voc
CCOPT = -fPIC $(INCLUDEPATH) -g
CC = cc $(CCOPT) -c
CL = cc $(CCOPT)
LD = libtool -dynamic -lSystem -compatibility_version $(RELEASE) -current_version $(RELEASE) -install_name $(PREFIX)/lib/$(LIBRARY).dylib -o $(LIBRARY).dylib
SHRLIBEXT = dylib
CC = $(CCOMP) $(CCOPT) -c
CL = $(CCOMP) $(CCOPT)
LD = libtool -dynamic -lSystem -compatibility_version $(RELEASE) -current_version $(RELEASE) -install_name $(PREFIX)/lib/$(LIBRARY).$(SHRLIBEXT) -o $(LIBRARY).$(SHRLIBEXT)
# s is necessary to create index inside a archive
ARCHIVE = ar rcs $(LIBRARY).a
@ -274,7 +274,7 @@ clean:
rm *.sym
rm *.o
rm *.a
rm *.dylib
rm *.$(SHRLIBEXT)
install:
test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@ -289,7 +289,7 @@ install:
test -d $(PREFIX)/lib/voc/obj | mkdir -p $(PREFIX)/lib/voc/obj
test -d $(PREFIX)/lib/voc/sym | mkdir -p $(PREFIX)/lib/voc/sym
cp $(LIBRARY).dylib $(PREFIX)/lib
cp $(LIBRARY).$(SHRLIBEXT) $(PREFIX)/lib
cp $(LIBRARY).a $(PREFIX)/lib
cp *.c $(PREFIX)/lib/voc/obj/
cp *.h $(PREFIX)/lib/voc/obj/

View file

@ -26,10 +26,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
PREFIXLN = $(PRF)/voc
CCOPT = -fPIC $(INCLUDEPATH) -g
CC = clang $(CCOPT) -c
CL = clang $(CCOPT)
LD = clang -shared -lX11 -o $(LIBRARY).so
SHRLIBEXT = so
CC = $(CCOMP) $(CCOPT) -c
CL = $(CCOMP) $(CCOPT)
LD = $(CCOMP) -shared -lX11 -o $(LIBRARY).$(SHRLIBEXT)
# s is necessary to create index inside a archive
ARCHIVE = ar rcs $(LIBRARY).a
@ -272,7 +272,7 @@ clean:
rm *.sym
rm *.o
rm *.a
rm *.so
rm *.$(SHRLIBEXT)
install:
test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@ -287,7 +287,7 @@ install:
test -d $(PREFIX)/lib/voc/obj | mkdir -p $(PREFIX)/lib/voc/obj
test -d $(PREFIX)/lib/voc/sym | mkdir -p $(PREFIX)/lib/voc/sym
cp $(LIBRARY).so $(PREFIX)/lib
cp $(LIBRARY).$(SHRLIBEXT) $(PREFIX)/lib
cp $(LIBRARY).a $(PREFIX)/lib
cp *.c $(PREFIX)/lib/voc/obj/
cp *.h $(PREFIX)/lib/voc/obj/

View file

@ -26,10 +26,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
PREFIXLN = $(PRF)/voc
CCOPT = -fPIC $(INCLUDEPATH) -g
CC = clang $(CCOPT) -c
CL = clang $(CCOPT)
LD = clang -shared -lX11 -o $(LIBRARY).so
SHRLIBEXT = so
CC = $(CCOMP) $(CCOPT) -c
CL = $(CCOMP) $(CCOPT)
LD = $(CCOMP) -shared -lX11 -o $(LIBRARY).$(SHRLIBEXT)
# s is necessary to create index inside a archive
ARCHIVE = ar rcs $(LIBRARY).a
@ -272,7 +272,7 @@ clean:
rm *.sym
rm *.o
rm *.a
rm *.so
rm *.$(SHRLIBEXT)
install:
test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@ -287,7 +287,7 @@ install:
test -d $(PREFIX)/lib/voc/obj | mkdir -p $(PREFIX)/lib/voc/obj
test -d $(PREFIX)/lib/voc/sym | mkdir -p $(PREFIX)/lib/voc/sym
cp $(LIBRARY).so $(PREFIX)/lib
cp $(LIBRARY).$(SHRLIBEXT) $(PREFIX)/lib
cp $(LIBRARY).a $(PREFIX)/lib
cp *.c $(PREFIX)/lib/voc/obj/
cp *.h $(PREFIX)/lib/voc/obj/

View file

@ -3,7 +3,7 @@ BUILDID=$(shell date +%Y/%m/%d)
TOS = linux
TARCH = armv6j
#TARCH = x86 x86_64 armv6j armv6j_hardfp armv7a_hardfp powerpc
CCOMP = gnuc
CCOMP = gcc
RELEASE = 1.0
@ -26,10 +26,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
PREFIXLN = $(PRF)/voc
CCOPT = -fPIC $(INCLUDEPATH) -g
CC = cc $(CCOPT) -c
CL = cc $(CCOPT)
LD = cc -shared -lX11 -o $(LIBRARY).so
SHRLIBEXT = so
CC = $(CCOMP) $(CCOPT) -c
CL = $(CCOMP) $(CCOPT)
LD = $(CCOMP) -shared -lX11 -o $(LIBRARY).$(SHRLIBEXT)
# s is necessary to create index inside a archive
ARCHIVE = ar rcs $(LIBRARY).a
@ -272,7 +272,7 @@ clean:
rm *.sym
rm *.o
rm *.a
rm *.so
rm *.$(SHRLIBEXT)
install:
test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@ -287,7 +287,7 @@ install:
test -d $(PREFIX)/lib/voc/obj | mkdir -p $(PREFIX)/lib/voc/obj
test -d $(PREFIX)/lib/voc/sym | mkdir -p $(PREFIX)/lib/voc/sym
cp $(LIBRARY).so $(PREFIX)/lib
cp $(LIBRARY).$(SHRLIBEXT) $(PREFIX)/lib
cp $(LIBRARY).a $(PREFIX)/lib
cp *.c $(PREFIX)/lib/voc/obj/
cp *.h $(PREFIX)/lib/voc/obj/

View file

@ -3,7 +3,7 @@ BUILDID=$(shell date +%Y/%m/%d)
TOS = linux
TARCH = armv6j_hardfp
#TARCH = x86 x86_64 armv6j armv6j_hardfp armv7a_hardfp powerpc
CCOMP = gnuc
CCOMP = gcc
RELEASE = 1.0
@ -26,10 +26,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
PREFIXLN = $(PRF)/voc
CCOPT = -fPIC $(INCLUDEPATH) -g
CC = cc $(CCOPT) -c
CL = cc $(CCOPT)
LD = cc -shared -lX11 -o $(LIBRARY).so
SHRLIBEXT = so
CC = $(CCOMP) $(CCOPT) -c
CL = $(CCOMP) $(CCOPT)
LD = $(CCOMP) -shared -lX11 -o $(LIBRARY).$(SHRLIBEXT)
# s is necessary to create index inside a archive
ARCHIVE = ar rcs $(LIBRARY).a
@ -272,7 +272,7 @@ clean:
rm *.sym
rm *.o
rm *.a
rm *.so
rm *.$(SHRLIBEXT)
install:
test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@ -287,7 +287,7 @@ install:
test -d $(PREFIX)/lib/voc/obj | mkdir -p $(PREFIX)/lib/voc/obj
test -d $(PREFIX)/lib/voc/sym | mkdir -p $(PREFIX)/lib/voc/sym
cp $(LIBRARY).so $(PREFIX)/lib
cp $(LIBRARY).$(SHRLIBEXT) $(PREFIX)/lib
cp $(LIBRARY).a $(PREFIX)/lib
cp *.c $(PREFIX)/lib/voc/obj/
cp *.h $(PREFIX)/lib/voc/obj/

View file

@ -3,7 +3,7 @@ BUILDID=$(shell date +%Y/%m/%d)
TOS = linux
TARCH = armv7a_hardfp
#TARCH = x86 x86_64 armv6j armv6j_hardfp armv7a_hardfp powerpc
CCOMP = gnuc
CCOMP = gcc
RELEASE = 1.0
@ -26,10 +26,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
PREFIXLN = $(PRF)/voc
CCOPT = -fPIC $(INCLUDEPATH) -g
CC = cc $(CCOPT) -c
CL = cc $(CCOPT)
LD = cc -shared -lX11 -o $(LIBRARY).so
SHRLIBEXT = so
CC = $(CCOMP) $(CCOPT) -c
CL = $(CCOMP) $(CCOPT)
LD = $(CCOMP) -shared -lX11 -o $(LIBRARY).$(SHRLIBEXT)
# s is necessary to create index inside a archive
ARCHIVE = ar rcs $(LIBRARY).a
@ -272,7 +272,7 @@ clean:
rm *.sym
rm *.o
rm *.a
rm *.so
rm *.$(SHRLIBEXT)
install:
test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@ -287,7 +287,7 @@ install:
test -d $(PREFIX)/lib/voc/obj | mkdir -p $(PREFIX)/lib/voc/obj
test -d $(PREFIX)/lib/voc/sym | mkdir -p $(PREFIX)/lib/voc/sym
cp $(LIBRARY).so $(PREFIX)/lib
cp $(LIBRARY).$(SHRLIBEXT) $(PREFIX)/lib
cp $(LIBRARY).a $(PREFIX)/lib
cp *.c $(PREFIX)/lib/voc/obj/
cp *.h $(PREFIX)/lib/voc/obj/

View file

@ -3,7 +3,7 @@ BUILDID=$(shell date +%Y/%m/%d)
TOS = linux
TARCH = powerpc
#TARCH = x86 x86_64 armv6j armv6j_hardfp armv7a_hardfp powerpc
CCOMP = gnuc
CCOMP = gcc
RELEASE = 1.0
@ -26,10 +26,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
PREFIXLN = $(PRF)/voc
CCOPT = -fPIC $(INCLUDEPATH) -g
CC = cc $(CCOPT) -c
CL = cc $(CCOPT)
LD = cc -shared -lX11 -o $(LIBRARY).so
SHRLIBEXT = so
CC = $(CCOMP) $(CCOPT) -c
CL = $(CCOMP) $(CCOPT)
LD = $(CCOMP) -shared -lX11 -o $(LIBRARY).$(SHRLIBEXT)
# s is necessary to create index inside a archive
ARCHIVE = ar rcs $(LIBRARY).a
@ -272,7 +272,7 @@ clean:
rm *.sym
rm *.o
rm *.a
rm *.so
rm *.$(SHRLIBEXT)
install:
test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@ -287,7 +287,7 @@ install:
test -d $(PREFIX)/lib/voc/obj | mkdir -p $(PREFIX)/lib/voc/obj
test -d $(PREFIX)/lib/voc/sym | mkdir -p $(PREFIX)/lib/voc/sym
cp $(LIBRARY).so $(PREFIX)/lib
cp $(LIBRARY).$(SHRLIBEXT) $(PREFIX)/lib
cp $(LIBRARY).a $(PREFIX)/lib
cp *.c $(PREFIX)/lib/voc/obj/
cp *.h $(PREFIX)/lib/voc/obj/

View file

@ -3,7 +3,7 @@ BUILDID=$(shell date +%Y/%m/%d)
TOS = linux
TARCH = x86
#TARCH = x86 x86_64 armv6j armv6j_hardfp armv7a_hardfp powerpc
CCOMP = gnuc
CCOMP = gcc
RELEASE = 1.0
@ -26,10 +26,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
PREFIXLN = $(PRF)/voc
CCOPT = -fPIC $(INCLUDEPATH) -g
CC = cc $(CCOPT) -c
CL = cc $(CCOPT)
LD = cc -shared -lX11 -o $(LIBRARY).so
SHRLIBEXT = so
CC = $(CCOMP) $(CCOPT) -c
CL = $(CCOMP) $(CCOPT)
LD = $(CCOMP) -shared -lX11 -o $(LIBRARY).$(SHRLIBEXT)
# s is necessary to create index inside a archive
ARCHIVE = ar rcs $(LIBRARY).a
@ -272,7 +272,7 @@ clean:
rm *.sym
rm *.o
rm *.a
rm *.so
rm *.$(SHRLIBEXT)
install:
test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@ -287,7 +287,7 @@ install:
test -d $(PREFIX)/lib/voc/obj | mkdir -p $(PREFIX)/lib/voc/obj
test -d $(PREFIX)/lib/voc/sym | mkdir -p $(PREFIX)/lib/voc/sym
cp $(LIBRARY).so $(PREFIX)/lib
cp $(LIBRARY).$(SHRLIBEXT) $(PREFIX)/lib
cp $(LIBRARY).a $(PREFIX)/lib
cp *.c $(PREFIX)/lib/voc/obj/
cp *.h $(PREFIX)/lib/voc/obj/

View file

@ -3,7 +3,7 @@ BUILDID=$(shell date +%Y/%m/%d)
TOS = linux
TARCH = x86_64
#TARCH = x86 x86_64 armv6j armv6j_hardfp armv7a_hardfp powerpc
CCOMP = gnuc
CCOMP = gcc
RELEASE = 1.0
@ -26,10 +26,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
PREFIXLN = $(PRF)/voc
CCOPT = -fPIC $(INCLUDEPATH) -g
CC = cc $(CCOPT) -c
CL = cc $(CCOPT)
LD = cc -shared -lX11 -o $(LIBRARY).so
SHRLIBEXT = so
CC = $(CCOMP) $(CCOPT) -c
CL = $(CCOMP) $(CCOPT)
LD = $(CCOMP) -shared -lX11 -o $(LIBRARY).$(SHRLIBEXT)
# s is necessary to create index inside a archive
ARCHIVE = ar rcs $(LIBRARY).a
@ -272,7 +272,7 @@ clean:
rm *.sym
rm *.o
rm *.a
rm *.so
rm *.$(SHRLIBEXT)
install:
test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@ -287,7 +287,7 @@ install:
test -d $(PREFIX)/lib/voc/obj | mkdir -p $(PREFIX)/lib/voc/obj
test -d $(PREFIX)/lib/voc/sym | mkdir -p $(PREFIX)/lib/voc/sym
cp $(LIBRARY).so $(PREFIX)/lib
cp $(LIBRARY).$(SHRLIBEXT) $(PREFIX)/lib
cp $(LIBRARY).a $(PREFIX)/lib
cp *.c $(PREFIX)/lib/voc/obj/
cp *.h $(PREFIX)/lib/voc/obj/

View file

@ -8,7 +8,7 @@ VOC = $(SETPATH) /opt/voc/bin/voc
all:
$(VOC) -m test.Mod
#$(VOC) -Cm test.Mod
#gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gnuc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
#gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
clean:
rm *.c

View file

@ -8,7 +8,7 @@ VOC = $(SETPATH) /opt/voc/bin/voc
all:
$(VOC) -s Linie.Mod Minesweeper.Mod -m
#$(VOC) -Cm test.Mod
#gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gnuc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
#gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
clean:
rm *.c

View file

@ -8,7 +8,7 @@ VOC = $(SETPATH) /opt/voc/bin/voc
all:
$(VOC) -s Grafik.Mod PacMan.Mod -m
#$(VOC) -Cm test.Mod
#gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gnuc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
#gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
clean:
rm *.c

View file

@ -8,7 +8,7 @@ VOC = $(SETPATH) /opt/voc/bin/voc
all:
$(VOC) -s Linie.Mod Ziffer.Mod Tetris.Mod -m
#$(VOC) -Cm test.Mod
#gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gnuc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
#gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
clean:
rm *.c

View file

@ -8,7 +8,7 @@ VOC = $(SETPATH) /opt/voc/bin/voc
all:
$(VOC) Tron.Mod -m
#$(VOC) -Cm test.Mod
#gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gnuc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
#gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
clean:
rm *.c

View file

@ -8,7 +8,7 @@ VOC = $(SETPATH) /opt/voc/bin/voc
all:
$(VOC) -s Ausgabe.Mod Vier.Mod -m
#$(VOC) -Cm test.Mod
#gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gnuc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
#gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
clean:
rm *.c

View file

@ -6,6 +6,7 @@ CCOPT = -fPIC $(INCLUDEPATH) -g
CLOBERONOPTS = -fPIC $(INCLUDEPATH) -L. -L/usr/lib -lVishapOberon -static -g
CC = cc $(CCOPT) -c
*)
CONST compiler="clang";
VAR incPath0, incPath1, ccOpt, ccString, CFLAGS, tmp0, tmp1 : ARRAY 1023 OF CHAR;
@ -33,7 +34,6 @@ cc : ARRAY 1023 OF CHAR;
ccopt : ARRAY 1023 OF CHAR;
cmd : ARRAY 1023 OF CHAR;
ext : ARRAY 5 OF CHAR;
cmd2 : ARRAY 1023 OF CHAR;
BEGIN
(*
@ -80,7 +80,8 @@ END LinkMain;
BEGIN
incPath0 := "src/lib/system/darwin/clang";
incPath0 := "src/lib/system/darwin/";
Strings.Append (compiler, incPath0);
incPath1 := "lib/voc/obj ";
ccOpt := " -fPIC -g ";
@ -98,7 +99,7 @@ Strings.Append(tmp1, ccOpt);
Args.GetEnv("CFLAGS", CFLAGS);
Strings.Append (CFLAGS, ccOpt);
Strings.Append (" ", ccOpt);
ccString := "cc ";
(*Strings.Append (ccOpt, ccString);*)
ccString := compiler;
Strings.Append (" ", ccString);
END extTools.

View file

@ -6,6 +6,7 @@ CCOPT = -fPIC $(INCLUDEPATH) -g
CLOBERONOPTS = -fPIC $(INCLUDEPATH) -L. -L/usr/lib -lOberon -static -g
CC = cc $(CCOPT) -c
*)
CONST compiler="clang";
VAR incPath0, incPath1, ccOpt, ccString, CFLAGS, tmp0, tmp1 : ARRAY 1023 OF CHAR;
@ -62,7 +63,8 @@ END LinkMain;
BEGIN
incPath0 := "src/lib/system/linux/clang";
incPath0 := "src/lib/system/linux/";
Strings.Append (compiler, incPath0);
incPath1 := "lib/voc/obj ";
ccOpt := " -fPIC -g ";
@ -80,7 +82,7 @@ Strings.Append(tmp1, ccOpt);
Args.GetEnv("CFLAGS", CFLAGS);
Strings.Append (CFLAGS, ccOpt);
Strings.Append (" ", ccOpt);
ccString := "clang ";
(*Strings.Append (ccOpt, ccString);*)
ccString := compiler;
Strings.Append (" ", ccString);
END extTools.

View file

@ -6,6 +6,7 @@ CCOPT = -fPIC $(INCLUDEPATH) -g
CLOBERONOPTS = -fPIC $(INCLUDEPATH) -L. -L/usr/lib -lOberon -static -g
CC = cc $(CCOPT) -c
*)
CONST compiler="gcc";
VAR incPath0, incPath1, ccOpt, ccString, CFLAGS, tmp0, tmp1 : ARRAY 1023 OF CHAR;
@ -62,7 +63,8 @@ END LinkMain;
BEGIN
incPath0 := "src/lib/system/linux/gnuc";
incPath0 := "src/lib/system/linux/";
Strings.Append (compiler, incPath0);
incPath1 := "lib/voc/obj ";
ccOpt := " -fPIC -g ";
@ -77,15 +79,10 @@ Strings.Append(version.prefix, tmp1);
Strings.Append("/", tmp1);
Strings.Append(incPath1, tmp1);
Strings.Append(tmp1, ccOpt);
(*
Strings.Append ("-lVishapOberon -L. -L", ccOpt);
Strings.Append (version.prefix, ccOpt);
Strings.Append ("/lib ", ccOpt);
*)
Args.GetEnv("CFLAGS", CFLAGS);
Strings.Append (CFLAGS, ccOpt);
Strings.Append (" ", ccOpt);
ccString := "cc ";
(*Strings.Append (ccOpt, ccString);*)
ccString := compiler;
Strings.Append (" ", ccString);
END extTools.

View file

@ -1,5 +1,5 @@
SETPATH = MODULES=".:gnuc:gnuc/x86_64"
SETPATH = MODULES=".:gcc:gcc/x86_64"
VOC0 = $(SETPATH) /opt/voc/bin/voc

View file

@ -1 +1 @@
09450eb346c6cc2c136316f7b2010d955a9b3c5a
6e5167bb4612bdd49ff2a901df26c5aa1c5ac1fe

View file

@ -1 +1 @@
09450eb346c6cc2c136316f7b2010d955a9b3c5a
6e5167bb4612bdd49ff2a901df26c5aa1c5ac1fe

View file

@ -0,0 +1 @@
61b5753acc412437ff8651ca9e966787ec455b07

View file

@ -1 +0,0 @@
cdb8a13e4b5934d5f3e3e447f26636575b6b12a8