mirror of
https://github.com/vishapoberon/compiler.git
synced 2026-04-06 18:02:25 +00:00
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.
This commit is contained in:
parent
d1ce637c81
commit
b18729c519
7 changed files with 10 additions and 9 deletions
BIN
ocat
BIN
ocat
Binary file not shown.
BIN
showdef
BIN
showdef
Binary file not shown.
|
|
@ -169,9 +169,10 @@ BEGIN
|
||||||
Args.GetEnv("OBERON", OBERON);
|
Args.GetEnv("OBERON", OBERON);
|
||||||
(* always have current directory in module search path, noch *)
|
(* always have current directory in module search path, noch *)
|
||||||
Strings.Append(":.:", OBERON);
|
Strings.Append(":.:", OBERON);
|
||||||
|
Strings.Append(MODULES, OBERON);
|
||||||
|
Strings.Append(":", OBERON);
|
||||||
Strings.Append(version.prefix, OBERON);
|
Strings.Append(version.prefix, OBERON);
|
||||||
Strings.Append("/lib/voc/sym:", OBERON);
|
Strings.Append("/lib/voc/sym:", OBERON);
|
||||||
Strings.Append(MODULES, OBERON);
|
|
||||||
Args.GetEnv("OBERON_LIB", LIB);
|
Args.GetEnv("OBERON_LIB", LIB);
|
||||||
TimeUnit := 1000; timeStart := 0; timeStart := Time()
|
TimeUnit := 1000; timeStart := 0; timeStart := Time()
|
||||||
END Kernel.
|
END Kernel.
|
||||||
|
|
|
||||||
|
|
@ -7,11 +7,11 @@ CLOBERONOPTS = -fPIC $(INCLUDEPATH) -L. -L/usr/lib -lOberon -static -g
|
||||||
CC = cc $(CCOPT) -c
|
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);
|
PROCEDURE Assemble*(m : ARRAY OF CHAR);
|
||||||
VAR cmd : ARRAY 1024 OF CHAR;
|
VAR cmd : ARRAY 1023 OF CHAR;
|
||||||
cc : ARRAY 23 OF CHAR;
|
cc : ARRAY 1023 OF CHAR;
|
||||||
ext : ARRAY 5 OF CHAR;
|
ext : ARRAY 5 OF CHAR;
|
||||||
BEGIN
|
BEGIN
|
||||||
COPY (ccString, cc);
|
COPY (ccString, cc);
|
||||||
|
|
@ -28,10 +28,10 @@ END Assemble;
|
||||||
|
|
||||||
|
|
||||||
PROCEDURE LinkMain*(VAR m : ARRAY OF CHAR; statically : BOOLEAN; additionalopts : ARRAY OF CHAR);
|
PROCEDURE LinkMain*(VAR m : ARRAY OF CHAR; statically : BOOLEAN; additionalopts : ARRAY OF CHAR);
|
||||||
VAR lpath : ARRAY 256 OF CHAR;
|
VAR lpath : ARRAY 1023 OF CHAR;
|
||||||
cc : ARRAY 256 OF CHAR;
|
cc : ARRAY 1023 OF CHAR;
|
||||||
ccopt : ARRAY 256 OF CHAR;
|
ccopt : ARRAY 1023 OF CHAR;
|
||||||
cmd : ARRAY 256 OF CHAR;
|
cmd : ARRAY 1023 OF CHAR;
|
||||||
ext : ARRAY 5 OF CHAR;
|
ext : ARRAY 5 OF CHAR;
|
||||||
BEGIN
|
BEGIN
|
||||||
(*
|
(*
|
||||||
|
|
@ -51,7 +51,7 @@ Strings.Append(" -o ", cmd);
|
||||||
Strings.Append(m, cmd);
|
Strings.Append(m, cmd);
|
||||||
Strings.Append(" ", cmd);
|
Strings.Append(" ", cmd);
|
||||||
Strings.Append(ccOpt, 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);
|
Unix.system(cmd);
|
||||||
END LinkMain;
|
END LinkMain;
|
||||||
|
|
||||||
|
|
|
||||||
BIN
voc
BIN
voc
Binary file not shown.
BIN
vocstatic
BIN
vocstatic
Binary file not shown.
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue