mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-02-25 07:19:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Restore original redbean build linking

Browse source
This commit is contained in:
Justine Tunney 2023-07-05 20:04:43 -07:00
parent 97b7116953
commit 88612a2cd7
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
3 changed files with 21 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libc/intrin/cxafinalize.c
View file

@ -60,7 +60,7 @@ StartOverLocked:
if (!pred) { if (!pred) {
b2 = b->next; b2 = b->next;
if (b2) { if (b2) {
_npassert(b != &__cxa_blocks.root); _unassert(b != &__cxa_blocks.root);
if (_weaken(free)) { if (_weaken(free)) {
_weaken(free)(b); _weaken(free)(b);
} }

19
libc/intrin/strerrno.greg.c
View file

@ -1,19 +0,0 @@
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
╞══════════════════════════════════════════════════════════════════════════════╡
│ Copyright 2021 Justine Alexandra Roberts Tunney │
│ │
│ Permission to use, copy, modify, and/or distribute this software for │
│ any purpose with or without fee is hereby granted, provided that the │
│ above copyright notice and this permission notice appear in all copies. │
│ │
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/fmt/magnumstrs.internal.h"

43
tool/net/net.mk
View file

@ -98,21 +98,14 @@ TOOL_NET_REDBEAN_LUA_MODULES = \
o/$(MODE)/tool/net/lsqlite3.o \ o/$(MODE)/tool/net/lsqlite3.o \
o/$(MODE)/tool/net/largon2.o o/$(MODE)/tool/net/largon2.o
TOOL_NET_REDBEAN_STANDARD_ASSETS = \
tool/net/.init.lua \
tool/net/favicon.ico \
tool/net/redbean.png \
tool/net/help.txt
TOOL_NET_REDBEAN_STANDARD_ASSETS_ZIP = \
$(COMPILE) -AZIP -T$@ \
$(VM) o/$(MODE)/third_party/zip/zip.com -b$(TMPDIR) -9qj $@ \
$(TOOL_NET_REDBEAN_STANDARD_ASSETS)
o/$(MODE)/tool/net/redbean.com.dbg: \ o/$(MODE)/tool/net/redbean.com.dbg: \
$(TOOL_NET_DEPS) \ $(TOOL_NET_DEPS) \
o/$(MODE)/tool/net/redbean.o \
$(TOOL_NET_REDBEAN_LUA_MODULES) \ $(TOOL_NET_REDBEAN_LUA_MODULES) \
o/$(MODE)/tool/net/.init.lua.zip.o \
o/$(MODE)/tool/net/favicon.ico.zip.o \
o/$(MODE)/tool/net/redbean.png.zip.o \
o/$(MODE)/tool/net/help.txt.zip.o \
o/$(MODE)/tool/net/redbean.o \
o/$(MODE)/tool/net/net.pkg \ o/$(MODE)/tool/net/net.pkg \
$(CRT) \ $(CRT) \
$(APE_NO_MODIFY_SELF) $(APE_NO_MODIFY_SELF)
@ -122,12 +115,10 @@ o/$(MODE)/tool/net/redbean.com: \
o/$(MODE)/tool/net/redbean.com.dbg \ o/$(MODE)/tool/net/redbean.com.dbg \
o/$(MODE)/third_party/zip/zip.com \ o/$(MODE)/third_party/zip/zip.com \
o/$(MODE)/tool/build/symtab.com \ o/$(MODE)/tool/build/symtab.com \
$(TOOL_NET_REDBEAN_STANDARD_ASSETS) \
$(VM) $(VM)
@$(MAKE_OBJCOPY) @$(MAKE_OBJCOPY)
@$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_CREATE)
@$(MAKE_SYMTAB_ZIP) @$(MAKE_SYMTAB_ZIP)
@$(TOOL_NET_REDBEAN_STANDARD_ASSETS_ZIP)
o/$(MODE)/tool/net/lsqlite3.o: private \ o/$(MODE)/tool/net/lsqlite3.o: private \
CFLAGS += \ CFLAGS += \
@ -143,8 +134,8 @@ o/$(MODE)/tool/net/.init.lua.zip.o \
o/$(MODE)/tool/net/demo/.init.lua.zip.o \ o/$(MODE)/tool/net/demo/.init.lua.zip.o \
o/$(MODE)/tool/net/demo/.reload.lua.zip.o \ o/$(MODE)/tool/net/demo/.reload.lua.zip.o \
o/$(MODE)/tool/net/demo/sql.lua.zip.o \ o/$(MODE)/tool/net/demo/sql.lua.zip.o \
o/$(MODE)/tool/net/demo/sql-backup.lua.zip.o \ o/$(MODE)/tool/net/demo/sql-backup.lua.zip.o \
o/$(MODE)/tool/net/demo/sql-backupstore.lua.zip.o \ o/$(MODE)/tool/net/demo/sql-backupstore.lua.zip.o \
o/$(MODE)/tool/net/demo/unix-unix.lua.zip.o \ o/$(MODE)/tool/net/demo/unix-unix.lua.zip.o \
o/$(MODE)/tool/net/demo/unix-rawsocket.lua.zip.o \ o/$(MODE)/tool/net/demo/unix-rawsocket.lua.zip.o \
o/$(MODE)/tool/net/demo/unix-subprocess.lua.zip.o \ o/$(MODE)/tool/net/demo/unix-subprocess.lua.zip.o \
@ -249,6 +240,10 @@ o/$(MODE)/tool/net/redbean-demo.com: \
o/$(MODE)/tool/net/redbean-static.com.dbg: \ o/$(MODE)/tool/net/redbean-static.com.dbg: \
$(TOOL_NET_DEPS) \ $(TOOL_NET_DEPS) \
$(TOOL_NET_REDBEAN_LUA_MODULES) \ $(TOOL_NET_REDBEAN_LUA_MODULES) \
o/$(MODE)/tool/net/.init.lua.zip.o \
o/$(MODE)/tool/net/favicon.ico.zip.o \
o/$(MODE)/tool/net/redbean.png.zip.o \
o/$(MODE)/tool/net/help.txt.zip.o \
o/$(MODE)/tool/net/redbean-static.o \ o/$(MODE)/tool/net/redbean-static.o \
o/$(MODE)/tool/net/net.pkg \ o/$(MODE)/tool/net/net.pkg \
$(CRT) \ $(CRT) \
@ -259,12 +254,10 @@ o/$(MODE)/tool/net/redbean-static.com: \
o/$(MODE)/tool/net/redbean-static.com.dbg \ o/$(MODE)/tool/net/redbean-static.com.dbg \
o/$(MODE)/third_party/zip/zip.com \ o/$(MODE)/third_party/zip/zip.com \
o/$(MODE)/tool/build/symtab.com \ o/$(MODE)/tool/build/symtab.com \
$(TOOL_NET_REDBEAN_STANDARD_ASSETS) \
$(VM) $(VM)
@$(MAKE_OBJCOPY) @$(MAKE_OBJCOPY)
@$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_CREATE)
@$(MAKE_SYMTAB_ZIP) @$(MAKE_SYMTAB_ZIP)
@$(TOOL_NET_REDBEAN_STANDARD_ASSETS_ZIP)
# REDBEAN-UNSECURE.COM # REDBEAN-UNSECURE.COM
# #
@ -274,8 +267,12 @@ o/$(MODE)/tool/net/redbean-static.com: \
o/$(MODE)/tool/net/redbean-unsecure.com.dbg: \ o/$(MODE)/tool/net/redbean-unsecure.com.dbg: \
$(TOOL_NET_DEPS) \ $(TOOL_NET_DEPS) \
o/$(MODE)/tool/net/redbean-unsecure.o \
$(TOOL_NET_REDBEAN_LUA_MODULES) \ $(TOOL_NET_REDBEAN_LUA_MODULES) \
o/$(MODE)/tool/net/.init.lua.zip.o \
o/$(MODE)/tool/net/favicon.ico.zip.o \
o/$(MODE)/tool/net/redbean.png.zip.o \
o/$(MODE)/tool/net/help.txt.zip.o \
o/$(MODE)/tool/net/redbean-unsecure.o \
o/$(MODE)/tool/net/net.pkg \ o/$(MODE)/tool/net/net.pkg \
$(CRT) \ $(CRT) \
$(APE_NO_MODIFY_SELF) $(APE_NO_MODIFY_SELF)
@ -285,12 +282,10 @@ o/$(MODE)/tool/net/redbean-unsecure.com: \
o/$(MODE)/tool/net/redbean-unsecure.com.dbg \ o/$(MODE)/tool/net/redbean-unsecure.com.dbg \
o/$(MODE)/third_party/zip/zip.com \ o/$(MODE)/third_party/zip/zip.com \
o/$(MODE)/tool/build/symtab.com \ o/$(MODE)/tool/build/symtab.com \
$(TOOL_NET_REDBEAN_STANDARD_ASSETS) \
$(VM) $(VM)
@$(MAKE_OBJCOPY) @$(MAKE_OBJCOPY)
@$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_CREATE)
@$(MAKE_SYMTAB_ZIP) @$(MAKE_SYMTAB_ZIP)
@$(TOOL_NET_REDBEAN_STANDARD_ASSETS_ZIP)
# REDBEAN-ORIGINAL.COM # REDBEAN-ORIGINAL.COM
# #
@ -301,6 +296,10 @@ o/$(MODE)/tool/net/redbean-unsecure.com: \
o/$(MODE)/tool/net/redbean-original.com.dbg: \ o/$(MODE)/tool/net/redbean-original.com.dbg: \
$(TOOL_NET_DEPS) \ $(TOOL_NET_DEPS) \
$(TOOL_NET_REDBEAN_LUA_MODULES) \ $(TOOL_NET_REDBEAN_LUA_MODULES) \
o/$(MODE)/tool/net/.init.lua.zip.o \
o/$(MODE)/tool/net/favicon.ico.zip.o \
o/$(MODE)/tool/net/redbean.png.zip.o \
o/$(MODE)/tool/net/help.txt.zip.o \
o/$(MODE)/tool/net/redbean-original.o \ o/$(MODE)/tool/net/redbean-original.o \
o/$(MODE)/tool/net/net.pkg \ o/$(MODE)/tool/net/net.pkg \
$(CRT) \ $(CRT) \
@ -311,12 +310,10 @@ o/$(MODE)/tool/net/redbean-original.com: \
o/$(MODE)/tool/net/redbean-original.com.dbg \ o/$(MODE)/tool/net/redbean-original.com.dbg \
o/$(MODE)/third_party/zip/zip.com \ o/$(MODE)/third_party/zip/zip.com \
o/$(MODE)/tool/build/symtab.com \ o/$(MODE)/tool/build/symtab.com \
$(TOOL_NET_REDBEAN_STANDARD_ASSETS) \
$(VM) $(VM)
@$(MAKE_OBJCOPY) @$(MAKE_OBJCOPY)
@$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_CREATE)
@$(MAKE_SYMTAB_ZIP) @$(MAKE_SYMTAB_ZIP)
@$(TOOL_NET_REDBEAN_STANDARD_ASSETS_ZIP)
o/$(MODE)/tool/net/demo/.lua/.zip.o: \ o/$(MODE)/tool/net/demo/.lua/.zip.o: \
tool/net/demo/.lua tool/net/demo/.lua