diff options
| author | Alexander Hill <ahill@breadpudding.dev> | 2025-07-23 21:02:07 -0400 |
|---|---|---|
| committer | Alexander Hill <ahill@breadpudding.dev> | 2025-07-23 21:02:07 -0400 |
| commit | 82d185aee282c0ca4054cfeeabba6dc38869ba40 (patch) | |
| tree | 1b87c1c7a4c3fa29f4171d79d96fbde7d4e6de95 | |
| parent | 0ff496ab2d887977c03a477bfa34744f6bf6f0e9 (diff) | |
Deprecated sbin and applied CFLAGS to LLVM's first stage
/sbin is now symlinked to /bin for compatibility's sake
| -rwxr-xr-x | build-bootstrap.sh | 8 | ||||
| -rwxr-xr-x | build-image.sh | 23 |
2 files changed, 4 insertions, 27 deletions
diff --git a/build-bootstrap.sh b/build-bootstrap.sh index 0996b52..4c29c1b 100755 --- a/build-bootstrap.sh +++ b/build-bootstrap.sh @@ -1,6 +1,8 @@ #!/bin/sh -e export CC=clang +export CFLAGS="-O3 -march=skylake -pipe --sysroot=$MAPLE" export CXX=clang++ +export CXXFLAGS="$CFLAGS" export LD=ld.lld export MAPLE=$(pwd)/maple export THREADS=$(nproc) @@ -24,7 +26,7 @@ mkdir -p $MAPLE/maple/sources mkdir -p $MAPLE/mnt mkdir -p $MAPLE/proc mkdir -p $MAPLE/run -mkdir -p $MAPLE/sbin +ln -sf bin $MAPLE/sbin mkdir -p $MAPLE/sys mkdir -p $MAPLE/tmp mkdir -p $MAPLE/usr @@ -32,7 +34,7 @@ ln -sf ../bin $MAPLE/usr/bin mkdir -p $MAPLE/usr/include ln -sf ../lib $MAPLE/usr/lib ln -sf ../lib $MAPLE/usr/libexec -ln -sf ../sbin $MAPLE/usr/sbin +ln -sf ../bin $MAPLE/usr/sbin mkdir -p $MAPLE/usr/share mkdir -p $MAPLE/var mkdir -p $MAPLE/var/cache @@ -85,8 +87,6 @@ cd .. export CC="$MAPLE/maple/tools/bin/clang" export CXX="$MAPLE/maple/tools/bin/clang++" -export CFLAGS="-O3 -march=skylake -pipe --sysroot=$MAPLE" -export CXXFLAGS="$CFLAGS" export LD=$MAPLE/maple/tools/bin/ld.lld export PATH="$MAPLE/maple/tools/bin:$PATH" diff --git a/build-image.sh b/build-image.sh deleted file mode 100755 index ed26655..0000000 --- a/build-image.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -e -dd if=/dev/zero of=maple.img bs=1G count=16 -# TODO: Replace parted with sfdisk to reduce the number of dependencies required -# to build Maple Linux. ~ahill -parted --script maple.img \ - mklabel gpt \ - mkpart fat32 0% 512M \ - mkpart xfs 512M 100% \ - set 1 esp on -# FIXME: If we adjust the partition table above, these numbers are no longer -# accurate. Is there a way to automate this process in a rootless -# fashion? ~ahill -# FIXME: This process also gets slower with larger images. Is there a way to -# treat a specific offset and length of a file as its own file handle? -# ~ahill -dd if=/dev/zero of=maple.img1 count=997375 -mkfs.fat -F32 maple.img1 -dd if=maple.img1 of=maple.img seek=2048 conv=notrunc -rm maple.img1 -dd if=/dev/zero of=maple.img2 count=31457280 -mkfs.xfs maple.img2 -dd if=maple.img2 of=maple.img seek=999424 conv=notrunc -rm maple.img2
\ No newline at end of file |