d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Some more fixes

Browse source
This commit is contained in:
ceriel 1991-11-11 18:03:52 +00:00
parent 91fec7991e
commit 46ecc71373
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fast/driver/driver.c
View file

@ -34,11 +34,6 @@ Something wrong here! Only one of FM2, FPC, or FCC must be defined
#include <varargs.h> #include <varargs.h>
#include <stdio.h> #include <stdio.h>
#include <em_path.h> #include <em_path.h>
#define M2DEF "/lib/m2"
#define FASTDIR EM_DIR
#define CCINCL "/include/tail_ac"
char *ROOT_DIR = FASTDIR;
/* /*
Version producing ACK .o files in one pass. Version producing ACK .o files in one pass.
@ -56,10 +51,11 @@ struct arglist {
#define CPP_NAME "$H/lib.bin/cpp" #define CPP_NAME "$H/lib.bin/cpp"
#define LD_NAME "$H/lib.bin/em_led" #define LD_NAME "$H/lib.bin/em_led"
#define CV_NAME "$H/lib.bin/$S/cv" #define CV_NAME "$H/lib.bin/$S/cv"
#define SHELL "/bin/sh" #define SHELL "/bin/sh"
char *CPP; char *CPP;
char *COMP; char *COMP;
char *cc = "cc";
int kids = -1; int kids = -1;
int ecount = 0; int ecount = 0;
@ -451,7 +447,7 @@ main(argc, argv)
INCLUDE = expand_string("-I$H/lib/m2"); INCLUDE = expand_string("-I$H/lib/m2");
#endif FM2 #endif FM2
#ifdef FCC #ifdef FCC
INCLUDE = expand_string("-I$H/include/tail_ac"); INCLUDE = expand_string(ansi_c ? "-I$H/include/tail_ac" : "-I$H/include/_tail_cc");
append(&COMP_FLAGS, "-L"); append(&COMP_FLAGS, "-L");
#endif FCC #endif FCC
count = SRCFILES.al_argc; count = SRCFILES.al_argc;
@ -531,6 +527,7 @@ main(argc, argv)
if (RET_CODE == 0 && LDFILES.al_argc > 0) { if (RET_CODE == 0 && LDFILES.al_argc > 0) {
init(call); init(call);
expand(&LD_HEAD); expand(&LD_HEAD);
cc = "cc.2g";
expand(&LD_TAIL); expand(&LD_TAIL);
append(call, expand_string(LD_NAME)); append(call, expand_string(LD_NAME));
concat(call, &align); concat(call, &align);
@ -602,10 +599,10 @@ expand_string(s)
switch(*p++) { switch(*p++) {
case 'A': case 'A':
if (ansi_c) strcpy(q, "ac"); if (ansi_c) strcpy(q, "ac");
else strcpy(q, "cc.2g"); else strcpy(q, cc);
break; break;
case 'H': case 'H':
strcpy(q, ROOT_DIR); strcpy(q, EM_DIR);
break; break;
case 'M': case 'M':
strcpy(q, MACHNAME); strcpy(q, MACHNAME);