defer building assimilate, awk, sed, and unbourne to cosmo-all

This commit is contained in:
Connor Olding 2022-10-15 01:09:21 -07:00
parent 5cb78a7eb8
commit d44528a346
4 changed files with 14 additions and 12 deletions

View File

@ -50,8 +50,9 @@ build() { : \
&& build cosmo-perl \
&& build cosmo-yices \
\
&& bin=/cosmopolitan/bin \
&& yes_retrieve cosmo-base $bin/ape $bin/awk.com $bin/gzip.com $bin/make.com \
&& yes_retrieve cosmo-base /cosmopolitan/bin/ape \
&& bin=/usr/local/bin \
&& dbg_retrieve cosmo-all $bin/awk.com $bin/gzip.com $bin/make.com \
$bin/sed.com $bin/unbourne.com $bin/unzip.com $bin/zip.com \
&& dbg_retrieve cosmo-kuroko /bin/kuroko.com \
&& dbg_retrieve cosmo-muon /bin/muon.com \

View File

@ -1 +1,4 @@
FROM cosmo-dist
COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/assimilate.com /cosmopolitan/bin/
COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/awk.com /cosmopolitan/bin/
COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/sed.com /cosmopolitan/bin/

View File

@ -110,6 +110,5 @@ RUN --mount=type=tmpfs,target=/tmp : \
# these are essential too! \
RUN --mount=type=tmpfs,target=/tmp : \
&& ./expand ./makeit \
e//unbourne.com t//awk/awk.com t//sed/sed.com \
t//unzip/unzip.com t//zip/zip.com b//assimilate.com \
t//unzip/unzip.com t//zip/zip.com \
;

View File

@ -36,14 +36,13 @@ RUN --mount=type=tmpfs,target=/tmp : \
# discover .com files by uncommenting this command: \
#&& find o -name '*.com' ! -type d -exec printf '%s\n' cp -t /tmp/bin {} + | sort && exit 1 \
&& ./expand cp -t /tmp/bin \
e//unbourne.com t//awk/awk.com t//make/make.com \
t//sed/sed.com t//unzip/unzip.com t//zip/zip.com \
b//ar.com b//assimilate.com b//cocmd.com \
b//compile.com b//cp.com b//echo.com \
b//fixupobj.com b//gzip.com b//mkdeps.com \
b//mkdir.com b//package.com b//pwd.com \
b//rm.com b//rollup.com b//symtab.com \
b//touch.com b//unbundle.com b//zipobj.com \
t//make/make.com t//unzip/unzip.com t//zip/zip.com \
b//ar.com b//cocmd.com b//compile.com \
b//cp.com b//echo.com b//fixupobj.com \
b//gzip.com b//mkdeps.com b//mkdir.com \
b//package.com b//pwd.com b//rm.com \
b//rollup.com b//symtab.com b//touch.com \
b//unbundle.com b//zipobj.com \
&& dedupe /tmp/bin /distrib/bin/ \
#&& ln -s "../dist/$flavor/ape.elf" /distrib/bin/ape \
&& cp "dist/$flavor/ape.elf" /distrib/bin/ape \