New global optimizer driver

diff --git a/lib/descr/fe.src b/lib/descr/fe.src
index ad3dbc0..c77669d 100644 (file)
--- a/lib/descr/fe.src
+++ b/lib/descr/fe.src
@@ -20,8 +20,8 @@ name cpp
        mapflag -wo CPP_F={CPP_F?} -o
        mapflag -ansi ANSI_C=.ansi
        args {CPP_F?} ({SUFFIX?}:.ocm=-I{EM}/include/occam) \
-               ({ANSI_C?}:.ansi={ANSI_C_INCLUDES} {INCLUDES?}) \
-               ({ANSI_C?.c}:{SUFFIX}={C_INCLUDES} {INCLUDES?}) \
+               ({ANSI_C?}:.ansi={SYSINCLUDES?} {ANSI_C_INCLUDES} {INCLUDES?}) \
+               ({ANSI_C?.c}:{SUFFIX}={SYSINCLUDES?} {C_INCLUDES} {INCLUDES?}) \
                -D{NAME} \
                ({ANSI_C?.xx}:.xx=-DEM_WSIZE={w} -DEM_PSIZE={p} \
                -DEM_SSIZE={s} -DEM_LSIZE={l} -DEM_FSIZE={f} -DEM_DSIZE={d}) \
@@ -55,6 +55,7 @@ name cem
        need .c
        args \
                {CPP_F?} \
+               {SYSINCLUDES?} \
                ({ANSI_C?}:.ansi={ANSI_C_INCLUDES}) \
                ({ANSI_C?.c}:.c={C_INCLUDES}) \
                {INCLUDES?} \
@@ -173,13 +174,11 @@ name opt
        stdout
        optimizer
 end
-var EGO={EM}/lib/em_ego
 name ego
        from .m.ma
        to .gk
-       program /bin/sh
+       program {EM}/lib/em_ego
        mapflag -EGO-* EGO_F={EGO_F?} -*
-       mapflag -EGO=* EGO=*
 # The following lines are obsolete, but here for backwards compatibility.
 # They should be removed some day.
        mapflag -IL* EGO_F={EGO_F?} -IL*
@@ -200,7 +199,7 @@ name ego
        mapflag -a EGO_F={EGO_F?} -a
        mapflag -O* EGO_F={EGO_F?} -O*
        args \
-               {EGO} {EM} {EGO_F?} -P {EM}/lib/ego \
+               {EGO_F?} -P {EM}/lib/ego \
                -M{EM}/lib/ego/{M}descr <
        optimizer 2
        stdout