shithub: mc

Info  •  Files  •  Log  •  Branches

Merge branch 'master' of git+ssh://git.eigenstate.org/git/ori/mc

Conflicts:
	6/gen.c
	6/locs.c
	6/simp.c

--- a/6/gen.c

+++ b/6/gen.c

@@ -14,7 +14,6 @@

 #include "asm.h"

 #include "../config.h"

-

 static int islocal(Node *dcl)

 {

     if (dcl->decl.vis != Visintern)

--- a/mkfile

+++ b/mkfile

@@ -43,7 +43,8 @@

 config.h:

 	echo '#define Instroot "'/'"' > config.h

 	echo '#define Asmcmd {"6a", "-o", NULL}' >> config.h

-	echo '#define Linkcmd {"ar", "ru", NULL}' >> config.h

+	echo '#define Arcmd {"ar", "ru", NULL}' >> config.h

+	echo '#define Ldcmd {"6l", "-l", NULL}' >> config.h

 	echo '#define Symprefix ""' >> config.h

 	echo '#define Defaultasm Plan9' >> config.h