Implement more toolchain fixes

tool/build/ar.c

@@ -25,6 +25,7 @@
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/itoa.h"
+#include "libc/fmt/libgen.h"
 #include "libc/intrin/bits.h"
 #include "libc/intrin/safemacros.internal.h"
 #include "libc/log/check.h"

tool/build/compile.c

@@ -32,6 +32,7 @@
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/itoa.h"
+#include "libc/fmt/libgen.h"
 #include "libc/fmt/magnumstrs.internal.h"
 #include "libc/intrin/bits.h"
 #include "libc/intrin/kprintf.h"

tool/build/cp.c

@@ -22,6 +22,7 @@
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/fmt.h"
+#include "libc/fmt/libgen.h"
 #include "libc/fmt/magnumstrs.internal.h"
 #include "libc/mem/gc.h"
 #include "libc/runtime/runtime.h"

tool/build/mv.c

@@ -21,6 +21,7 @@
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/fmt.h"
+#include "libc/fmt/libgen.h"
 #include "libc/fmt/magnumstrs.internal.h"
 #include "libc/mem/gc.h"
 #include "libc/runtime/runtime.h"

tool/build/runit.c

@@ -25,6 +25,7 @@
 #include "libc/dns/dns.h"
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
+#include "libc/fmt/libgen.h"
 #include "libc/intrin/bits.h"
 #include "libc/intrin/safemacros.internal.h"
 #include "libc/limits.h"

tool/build/runitd.c

@@ -23,6 +23,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
+#include "libc/fmt/libgen.h"
 #include "libc/intrin/bits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"

tool/build/zipobj.c

@@ -20,6 +20,7 @@
 #include "libc/calls/struct/stat.h"
 #include "libc/elf/def.h"
 #include "libc/fmt/conv.h"
+#include "libc/fmt/libgen.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"

tool/decode/elf.c

@@ -24,6 +24,7 @@
 #include "libc/elf/struct/shdr.h"
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
+#include "libc/fmt/libgen.h"
 #include "libc/intrin/bits.h"
 #include "libc/intrin/safemacros.internal.h"
 #include "libc/log/check.h"

tool/decode/macho.c

@@ -20,6 +20,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/fmt/conv.h"
+#include "libc/fmt/libgen.h"
 #include "libc/intrin/safemacros.internal.h"
 #include "libc/macho.internal.h"
 #include "libc/runtime/runtime.h"

tool/decode/pe2.c

@@ -19,6 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/fmt/conv.h"
+#include "libc/fmt/libgen.h"
 #include "libc/intrin/bits.h"
 #include "libc/intrin/safemacros.internal.h"
 #include "libc/mem/gc.h"

tool/decode/zip.c

@@ -19,6 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/fmt/conv.h"
+#include "libc/fmt/libgen.h"
 #include "libc/intrin/bits.h"
 #include "libc/intrin/safemacros.internal.h"
 #include "libc/log/check.h"

tool/scripts/cosmoc++

@@ -67,6 +67,7 @@ EOF
 exit 0
 fi
 
+ORIGINAL="$0 $*"
 PLATFORM="-D__COSMOPOLITAN__"
 PREDEF="-include libc/integral/normalize.inc"
 CCFLAGS="-fdata-sections -ffunction-sections -fno-pie -mno-tls-direct-seg-refs -mno-red-zone -fportcosmo"
@@ -131,6 +132,10 @@ for x; do
     # this toolchain is intended for building other people's code
     # we don't need the compiler's assistance to be more portable
     continue
+  elif [ x"$x" = x"-static-libstdc++" ]; then
+    continue
+  elif [ x"$x" = x"-static-libgcc" ]; then
+    continue
   elif [ x"$x" != x"${x#-O}" ]; then
     OPT=$x
   elif [ x"$x" = x"-c" ]; then
@@ -160,8 +165,8 @@ for x; do
   set -- "$@" "$x"
 done
 
-if [ $RELOCATABLE -eq 0 ]; then
-  APEFLAGS=
+if [ $RELOCATABLE -eq 1 ]; then
+  APEFLAGS="-r"
 fi
 
 if [ x"$MODE" = x"nox87" ]; then
@@ -183,7 +188,7 @@ else
 fi
 
 set -- "$CXX" "$@"
-printf '(cd %s; %s)\n' "$PWD" "$*" >>/tmp/build.log
+printf '# %s\n(cd %s; %s)\n' "$ORIGINAL" "$PWD" "$*" >>/tmp/build.log
 "$@" || exit
 
 if [ -n "$OUTPUT" ] && [ -f "$OUTPUT" ]; then

tool/scripts/cosmocc

@@ -67,6 +67,7 @@ EOF
 exit 0
 fi
 
+ORIGINAL="$0 $*"
 PLATFORM="-D__COSMOPOLITAN__"
 PREDEF="-include libc/integral/normalize.inc"
 CCFLAGS="-fdata-sections -ffunction-sections -fno-pie -mno-tls-direct-seg-refs -mno-red-zone -fportcosmo"
@@ -131,6 +132,8 @@ for x; do
     # this toolchain is intended for building other people's code
     # we don't need the compiler's assistance to be more portable
     continue
+  elif [ x"$x" = x"-static-libgcc" ]; then
+    continue
   elif [ x"$x" != x"${x#-O}" ]; then
     OPT=$x
   elif [ x"$x" = x"-c" ]; then
@@ -161,7 +164,7 @@ for x; do
 done
 
 if [ $RELOCATABLE -eq 1 ]; then
-  APEFLAGS=
+  APEFLAGS="-r"
 fi
 
 if [ x"$MODE" = x"nox87" ]; then
@@ -183,7 +186,7 @@ else
 fi
 
 set -- "$CC" "$@"
-printf '(cd %s; %s)\n' "$PWD" "$*" >>/tmp/build.log
+printf '# %s\n(cd %s; %s)\n' "$ORIGINAL" "$PWD" "$*" >>/tmp/build.log
 "$@" || exit
 
 if [ -n "$OUTPUT" ] && [ -f "$OUTPUT" ]; then

tool/viz/fontspace.c

@@ -21,6 +21,7 @@
 #include "libc/calls/struct/winsize.h"
 #include "libc/calls/termios.h"
 #include "libc/fmt/conv.h"
+#include "libc/fmt/libgen.h"
 #include "libc/intrin/bsr.h"
 #include "libc/log/libfatal.internal.h"
 #include "libc/log/log.h"