Kernel.Mod fixed, so that MODULES variable is always checked first.

This means, custom module with the same name, as standard, will be checked first.


Former-commit-id: b18729c519
This commit is contained in:
Norayr Chilingarian 2013-11-14 18:47:49 +04:00
parent 48e4a887e5
commit 429a632e56
7 changed files with 14 additions and 13 deletions

BIN
ocat

Binary file not shown.

View file

@ -1 +1 @@
dbf175b1d1b9396c2486f2b84a751ccf93c6e8d6
127b39b0b88a2821cd08389f5930f44d9ced5c5c

View file

@ -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.

View file

@ -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;

View file

@ -1 +1 @@
2fc505939b09eb705049af5303ed9a421e519087
6f1a5b8457e70e043eab08632b20cf5a4f13f80b

View file

@ -1 +1 @@
bbe6d27c2b427336227ff2a9bf5db1ff160c9184
6f1a5b8457e70e043eab08632b20cf5a4f13f80b

View file

@ -1 +1 @@
bbe6d27c2b427336227ff2a9bf5db1ff160c9184
6f1a5b8457e70e043eab08632b20cf5a4f13f80b