minimal-boostrap.mes: Separate compiler and libs (23f849f4) · Commits · nix / nixpkgs

pkgs/os-specific/linux/minimal-bootstrap/default.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ lib.makeScope
		inherit (callPackage ./utils.nix { }) fetchurl derivationWithMeta writeTextFile writeText;

		test = kaem.runCommand "minimal-bootstrap-test" {} ''
		echo ${mes.tests.get-version}
		echo ${mes.compiler.tests.get-version}
		echo ${tinycc-mes.compiler.tests.chain}
		mkdir ''${out}
		'';

pkgs/os-specific/linux/minimal-bootstrap/ln-boot/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@ kaem.runCommand "${pname}-${version}" {
		};
		} ''
		mkdir -p ''${out}/bin
		${mes}/bin/mes --no-auto-compile -e main ${mes}/bin/mescc.scm -- \
		-L ${mes}/lib \
		${mes.compiler}/bin/mes --no-auto-compile -e main ${mes.srcPost.bin}/bin/mescc.scm -- \
		-L ${mes.libs}/lib \
		-lc+tcc \
		-o ''${out}/bin/ln \
		${src}

pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix

+56 −45

Original line number	Diff line number	Diff line
		@@ -170,10 +170,10 @@ let
		libc = mkLib "libc" libc_SOURCES;
		libc_tcc = mkLib "libc+tcc" libc_tcc_SOURCES;

		in kaem.runCommand "${pname}-${version}" {
		# Recompile Mes and Mes C library using mes-m2 bootstrapped Mes
		libs = kaem.runCommand "${pname}-m2-libs-${version}" {
		inherit pname version;

		passthru = { inherit src srcPost srcPrefix nyacc; };
		passthru.tests.get-version = result: kaem.runCommand "${pname}-get-version-${version}" {} ''
		${result}/bin/mes --version
		mkdir ''${out}
		@@ -183,15 +183,8 @@ in kaem.runCommand "${pname}-${version}" {
		}
		''
		LIBDIR=''${out}/lib
		BINDIR=''${out}/bin

		mkdir -p ''${out} ''${LIBDIR} ''${BINDIR}

		cp ${srcPost.bin}/bin/mescc.scm ''${BINDIR}/mescc.scm
		cp ${srcPost.bin}/bin/mes-m2 ''${BINDIR}/mes-m2
		chmod 555 ''${BINDIR}/mes-m2
		mkdir -p ''${out} ''${LIBDIR}

		# Recompile Mes and Mes C library using mes-m2 bootstrapped Mes
		mkdir -p ''${LIBDIR}/x86-mes

		# crt1.o
		@@ -213,16 +206,34 @@ in kaem.runCommand "${pname}-${version}" {
		# libc+tcc.a
		cp ${libc_tcc}/lib/libc+tcc.a ''${LIBDIR}/x86-mes
		cp ${libc_tcc}/lib/libc+tcc.s ''${LIBDIR}/x86-mes
		'';

		# Build mes itself
		''${out}/bin/mes-m2 -e main ''${out}/bin/mescc.scm -- \
		compiler = kaem.runCommand "${pname}-${version}" {
		inherit pname version;

		passthru.tests.get-version = result: kaem.runCommand "${pname}-get-version-${version}" {} ''
		${result}/bin/mes --version
		mkdir ''${out}
		'';

		inherit meta;
		}
		''
		mkdir -p ''${out}/bin

		${srcPost.bin}/bin/mes-m2 -e main ${srcPost.bin}/bin/mescc.scm -- \
		--base-address 0x08048000 \
		-L ''${srcPrefix}/lib \
		-L ''${LIBDIR} \
		-L ${libs}/lib \
		-lc \
		-lmescc \
		-nostdlib \
		-o ''${out}/bin/mes \
		''${LIBDIR}/x86-mes/crt1.o \
		${libs}/lib/x86-mes/crt1.o \
		${lib.concatMapStringsSep " " (getRes ".o") (map compile mes_SOURCES)}
		''
		'';
		in {
		inherit srcPost srcPrefix nyacc;
		inherit compiler libs;
		}

pkgs/os-specific/linux/minimal-bootstrap/mes/libc.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		}:
		let
		pname = "mes-libc";
		inherit (mes) version;
		inherit (mes.compiler) version;

		sources = (import ./sources.nix).x86.linux.gcc;
		inherit (sources) libtcc1_SOURCES libc_gnu_SOURCES;

pkgs/os-specific/linux/minimal-bootstrap/tinycc/bootstrappable.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ let
		'';
		} ''
		catm config.h
		${mes}/bin/mes --no-auto-compile -e main ${mes}/bin/mescc.scm -- \
		${mes.compiler}/bin/mes --no-auto-compile -e main ${mes.srcPost.bin}/bin/mescc.scm -- \
		-S \
		-o tcc.s \
		-I . \
		@@ -73,8 +73,8 @@ let
		-D ONE_SOURCE=1 \
		${src}/tcc.c
		mkdir -p ''${out}/bin
		${mes}/bin/mes --no-auto-compile -e main ${mes}/bin/mescc.scm -- \
		-L ${mes}/lib \
		${mes.compiler}/bin/mes --no-auto-compile -e main ${mes.srcPost.bin}/bin/mescc.scm -- \
		-L ${mes.libs}/lib \
		-l c+tcc \
		-o ''${out}/bin/tcc \
		tcc.s