Deprecated sbin and applied CFLAGS to LLVM's first stage

/sbin is now symlinked to /bin for compatibility's sake
This commit is contained in:
Alexander Hill 2025-07-23 21:02:07 -04:00
parent 0ff496ab2d
commit 82d185aee2
2 changed files with 4 additions and 27 deletions

View File

@ -1,6 +1,8 @@
#!/bin/sh -e #!/bin/sh -e
export CC=clang export CC=clang
export CFLAGS="-O3 -march=skylake -pipe --sysroot=$MAPLE"
export CXX=clang++ export CXX=clang++
export CXXFLAGS="$CFLAGS"
export LD=ld.lld export LD=ld.lld
export MAPLE=$(pwd)/maple export MAPLE=$(pwd)/maple
export THREADS=$(nproc) export THREADS=$(nproc)
@ -24,7 +26,7 @@ mkdir -p $MAPLE/maple/sources
mkdir -p $MAPLE/mnt mkdir -p $MAPLE/mnt
mkdir -p $MAPLE/proc mkdir -p $MAPLE/proc
mkdir -p $MAPLE/run mkdir -p $MAPLE/run
mkdir -p $MAPLE/sbin ln -sf bin $MAPLE/sbin
mkdir -p $MAPLE/sys mkdir -p $MAPLE/sys
mkdir -p $MAPLE/tmp mkdir -p $MAPLE/tmp
mkdir -p $MAPLE/usr mkdir -p $MAPLE/usr
@ -32,7 +34,7 @@ ln -sf ../bin $MAPLE/usr/bin
mkdir -p $MAPLE/usr/include mkdir -p $MAPLE/usr/include
ln -sf ../lib $MAPLE/usr/lib ln -sf ../lib $MAPLE/usr/lib
ln -sf ../lib $MAPLE/usr/libexec 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/usr/share
mkdir -p $MAPLE/var mkdir -p $MAPLE/var
mkdir -p $MAPLE/var/cache mkdir -p $MAPLE/var/cache
@ -85,8 +87,6 @@ cd ..
export CC="$MAPLE/maple/tools/bin/clang" export CC="$MAPLE/maple/tools/bin/clang"
export CXX="$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 LD=$MAPLE/maple/tools/bin/ld.lld
export PATH="$MAPLE/maple/tools/bin:$PATH" export PATH="$MAPLE/maple/tools/bin:$PATH"

View File

@ -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