Fixes for building superconfigure (#948)

jart · Nov 12, 2023 · 95124ca · 95124ca
1 parent b320321
commit 95124ca
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/libc/isystem/cxxabi.h b/libc/isystem/cxxabi.h
diff --git a/libc/isystem/future b/libc/isystem/future
@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_FUTURE_
+#define COSMOPOLITAN_LIBC_ISYSTEM_FUTURE_
+#include "third_party/libcxx/future"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_FUTURE_ */
diff --git a/libc/libc.mk b/libc/libc.mk
@@ -57,6 +57,7 @@ libc/isystem/ctime \
 libc/isystem/ctype.h \
 libc/isystem/cwchar \
 libc/isystem/cwctype \
+libc/isystem/cxxabi.h \
 libc/isystem/deque \
 libc/isystem/dirent.h \
 libc/isystem/dlfcn.h \
@@ -77,6 +78,7 @@ libc/isystem/forward_list \
 libc/isystem/fstream \
 libc/isystem/ftw.h \
 libc/isystem/functional \
+libc/isystem/future \
 libc/isystem/getopt.h \
 libc/isystem/glob.h \
 libc/isystem/grp.h \

diff --git a/tool/cosmocc/bin/cosmocross b/tool/cosmocc/bin/cosmocross
@@ -63,7 +63,12 @@ fi
 CC="$BIN/$ARCH-linux-cosmo-gcc"
 CRT="$BIN/../$ARCH-linux-cosmo/lib/crt.o"
 LDLIBS="-lcosmo"
-LDFLAGS="$LDFLAGS -L$BIN/../$ARCH-linux-cosmo/lib"
+if [ -z "$COSMOS" ]; then
+    LDFLAGS="$LDFLAGS -L$BIN/../$ARCH-linux-cosmo/lib"
+else
+    LDFLAGS="$LDFLAGS -L$COSMOS/lib -L$BIN/../$ARCH-linux-cosmo/lib"
+    CPPFLAGS="$CPPFLAGS -I$COSMOS/include"
+fi
 if [ x"$PROG" != x"${PROG%++}" ]; then
   CC="$BIN/$ARCH-linux-cosmo-g++"
   CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -fuse-cxa-atexit"