diff --git a/cosmo-yices/Dockerfile b/cosmo-yices/Dockerfile index 333c98d..863b52b 100644 --- a/cosmo-yices/Dockerfile +++ b/cosmo-yices/Dockerfile @@ -47,8 +47,6 @@ RUN : \ && shed src/application.c '/#include /i\\#include ' \ # completely override CFLAGS: \ && shed configure '/passtocompiler -fpic/i\\CFLAGS=" -O2 -g -Wall"' \ -# mitigate issues with 'shell' command (this related to using landlocked make) \ - && shed makefile.in '/^INCLUDES=/c\INCLUDES=-I../build' \ # we don't need -static here because it's already part of cosmocc: \ && CC=cosmocc ./configure \ ; @@ -85,11 +83,6 @@ RUN : \ && shed src/terms/bv_constants.c 's/\bhextoint\b/&_/g' \ && shed src/terms/bv64_constants.c 's/\bhextoint\b/&_/g' \ && shed src/utils/timeout.c '/#include /i\\#include ' \ -# mitigate issues with 'shell' command (this related to using landlocked make) \ - && shed Makefile \ -'/^ARCH=/c\ARCH=x86_64-pc-linux-gnu' \ -'/^POSIXOS=/c\POSIXOS=linux' \ -'/^YICES_TOP_DIR=/c\YICES_TOP_DIR=/yices' \ # the static-lib target attempts to build a dynamic library. don't do that. \ && shed src/Makefile 's/ $(static_libyices_dynamic)//g' \ \ diff --git a/cosmo/Dockerfile b/cosmo/Dockerfile index e023258..2f9151d 100644 --- a/cosmo/Dockerfile +++ b/cosmo/Dockerfile @@ -1,8 +1,8 @@ # MAIN: https://justine.lol/cosmopolitan/ # REPO: https://github.com/jart/cosmopolitan ARG COSMO_FLAVOR=def -ARG COSMO_COMMIT=31dab8a75d928df7a4cd2e9bcf42916b1810d085 -ARG COSMO_SHA256=4acafc98fa38a2429941ed46cbec4ac7c0c313641397d9c1fcda1a8e9115df80 +ARG COSMO_COMMIT=b41f91c65881b5d24071092c82ed09869cba52b9 +ARG COSMO_SHA256=fcf9ad831673e36035e9f7c802d5641084129a7ca8ec40264cb11f6b0bcaaaf5 FROM localhost/notwa-util AS downloader ARG COSMO_COMMIT COSMO_SHA256 diff --git a/cosmo/make.com b/cosmo/make.com index d11f22a..6a7c0b4 100755 Binary files a/cosmo/make.com and b/cosmo/make.com differ