From d7417fd043e482b3393e144cfc895bedd90394b3 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Thu, 21 May 2026 19:42:21 +0000
Subject: [PATCH] 9src/cc: pcc produces $O.out, keeps .6 objects; use basename
 for prog detection
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Use basename of argv[0] (strip path prefix) so /amd64/bin/ape/pcc is
  detected as "pcc" correctly
- pcc output: smprint("%s.out", ot->o) e.g. "6.out" — matches Plan9 6l default
  and what mkmany expects
- pcc keeps .6 object files after linking (Plan9 native convention);
  only cc mode removes the intermediate .o (APE configure-compat mode)

https://claude.ai/code/session_01WGAwvvTwDg2yknFkmZ3qzs
---
 sys/src/ape/9src/cc.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/sys/src/ape/9src/cc.c b/sys/src/ape/9src/cc.c
index ff0031305..587a667cb 100644
--- a/sys/src/ape/9src/cc.c
+++ b/sys/src/ape/9src/cc.c
@@ -60,16 +60,19 @@ char *searchlib(char *, char*);
 void
 main(int argc, char *argv[])
 {
-	char *s, *suf, *ccpath, *lib;
+	char *s, *suf, *ccpath, *lib, *prog;
 	char *oname, *objext;
 	int haveoname = 0;
 	int i, cppn, ccn;
 	Objtype *ot;
 
 	ot = findoty();
-	oname = "a.out";
-	/* cc produces .o (for configure compat); pcc uses arch-native .$O */
-	objext = (strcmp(argv[0], "cc") == 0) ? "o" : ot->o;
+	prog = utfrrune(argv[0], '/');
+	prog = prog ? prog+1 : argv[0];
+	/* cc: POSIX mode (.o objects, a.out output, clean up intermediates)
+	 * pcc: Plan9 native mode (.$O objects, $O.out output, keep objects) */
+	objext = (strcmp(prog, "cc") == 0) ? "o" : ot->o;
+	oname  = (strcmp(prog, "cc") == 0) ? "a.out" : smprint("%s.out", ot->o);
 	append(&cpp, "cpp");
 	append(&cpp, "-D__STDC__=1");	/* ANSI says so */
 	append(&cpp, "-D_POSIX_SOURCE=");
@@ -221,8 +224,8 @@ main(int argc, char *argv[])
 			append(&ld, objs.strings[i]);
 		append(&ld, smprint("/%s/lib/ape/libap.a", ot->name));
 		doexec(smprint("/bin/%s", ot->ld), &ld);
-		if(objs.n == 1)
-			remove(objs.strings[0]);
+		if(objs.n == 1 && strcmp(objext, "o") == 0)
+			remove(objs.strings[0]);	/* cc mode only: clean up .o intermediate */
 		if(gflag) {
 			/* post-link: convert a.out + .dwtypes sidecars to ELF64 */
 			memset(&dw2elf_cmd, 0, sizeof dw2elf_cmd);