diff --git a/ocat b/ocat index 3116d10f..10efb9d6 100755 Binary files a/ocat and b/ocat differ diff --git a/showdef b/showdef index dbf175b1..127b39b0 100755 Binary files a/showdef and b/showdef differ diff --git a/src/lib/v4/Kernel.Mod b/src/lib/v4/Kernel.Mod index 13e0c5f7..a13f9d3b 100644 --- a/src/lib/v4/Kernel.Mod +++ b/src/lib/v4/Kernel.Mod @@ -169,9 +169,10 @@ BEGIN Args.GetEnv("OBERON", OBERON); (* always have current directory in module search path, noch *) Strings.Append(":.:", OBERON); + Strings.Append(MODULES, OBERON); + Strings.Append(":", OBERON); Strings.Append(version.prefix, OBERON); Strings.Append("/lib/voc/sym:", OBERON); - Strings.Append(MODULES, OBERON); Args.GetEnv("OBERON_LIB", LIB); TimeUnit := 1000; timeStart := 0; timeStart := Time() END Kernel. diff --git a/src/voc/gnuc/extTools.Mod b/src/voc/gnuc/extTools.Mod index b5d6fc3f..b6ebfd11 100644 --- a/src/voc/gnuc/extTools.Mod +++ b/src/voc/gnuc/extTools.Mod @@ -7,11 +7,11 @@ CLOBERONOPTS = -fPIC $(INCLUDEPATH) -L. -L/usr/lib -lOberon -static -g CC = cc $(CCOPT) -c *) -VAR incPath0, incPath1, ccOpt, ccString, CFLAGS, tmp0, tmp1 : ARRAY 256 OF CHAR; +VAR incPath0, incPath1, ccOpt, ccString, CFLAGS, tmp0, tmp1 : ARRAY 1023 OF CHAR; PROCEDURE Assemble*(m : ARRAY OF CHAR); -VAR cmd : ARRAY 1024 OF CHAR; -cc : ARRAY 23 OF CHAR; +VAR cmd : ARRAY 1023 OF CHAR; +cc : ARRAY 1023 OF CHAR; ext : ARRAY 5 OF CHAR; BEGIN COPY (ccString, cc); @@ -28,10 +28,10 @@ END Assemble; PROCEDURE LinkMain*(VAR m : ARRAY OF CHAR; statically : BOOLEAN; additionalopts : ARRAY OF CHAR); -VAR lpath : ARRAY 256 OF CHAR; -cc : ARRAY 256 OF CHAR; -ccopt : ARRAY 256 OF CHAR; -cmd : ARRAY 256 OF CHAR; +VAR lpath : ARRAY 1023 OF CHAR; +cc : ARRAY 1023 OF CHAR; +ccopt : ARRAY 1023 OF CHAR; +cmd : ARRAY 1023 OF CHAR; ext : ARRAY 5 OF CHAR; BEGIN (* @@ -51,7 +51,7 @@ Strings.Append(" -o ", cmd); Strings.Append(m, cmd); Strings.Append(" ", cmd); Strings.Append(ccOpt, cmd); -(*Console.Ln; Console.String(cmd); Console.Ln;*) (* may be it's feasible to add debug mode later *) +Console.Ln; Console.String(cmd); Console.Ln; (* may be it's feasible to add debug mode later *) Unix.system(cmd); END LinkMain; diff --git a/voc b/voc index 2fc50593..6f1a5b84 100755 Binary files a/voc and b/voc differ diff --git a/vocstatic b/vocstatic index bbe6d27c..6f1a5b84 100755 Binary files a/vocstatic and b/vocstatic differ diff --git a/vocstatic.linux.gnuc.x86_64 b/vocstatic.linux.gnuc.x86_64 index bbe6d27c..6f1a5b84 100755 Binary files a/vocstatic.linux.gnuc.x86_64 and b/vocstatic.linux.gnuc.x86_64 differ