diff options
| -rwxr-xr-x | ports/bin/cc | 6 | ||||
| -rw-r--r-- | ports/doom | 8 | ||||
| -rw-r--r-- | ports/ed | 3 | ||||
| -rw-r--r-- | ports/lua | 4 | ||||
| l--------- | sysroot/usr/lib/libm.a | 1 |
5 files changed, 9 insertions, 13 deletions
diff --git a/ports/bin/cc b/ports/bin/cc deleted file mode 100755 index 8f9a8c0..0000000 --- a/ports/bin/cc +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -exec x86_64-camellia-gcc -fPIE \ - -nostdlib -Wl,-pie -Wl,-no-dynamic-linker -T $REPO/src/user/linker.ld \ - -I$REPO/src/ -I$REPO/src/shared/include/ -I$REPO/src/user/lib/include/ \ - $* \ - -L$REPO/out/ -lc -lgcc @@ -15,14 +15,14 @@ fetch() { cat <<\EOF > doomgeneric_camellia.c #include <camellia/syscalls.h> -#include <shared/container/ring.h> +#include <shared/ring.h> #include <stdbool.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <user/lib/draw/draw.h> -#include <user/lib/thread.h> +#include <draw.h> +#include <thread.h> #include "doomgeneric.h" #include "doomkeys.h" @@ -144,7 +144,7 @@ prep() { } case $1 in - install) (prep; make "CC=cc" && cp doomgeneric $PREFIX/bin/doom && cp *.WAD $PREFIX/) ;; + install) (prep; make "CC=x86_64-camellia-gcc" && cp doomgeneric $PREFIX/bin/doom && cp *.WAD $PREFIX/) ;; clean) (prep; make clean) ;; deepclean) (rm -rf doomgeneric) ;; *) echo "usage: $0 install|clean"; false ;; @@ -14,7 +14,7 @@ configure() { cat <<\EOF > Makefile # This Makefile automatically generated by configure. -CC = cc +CC = x86_64-camellia-gcc CFLAGS = -g -O2 -I. -D_GNU_SOURCE PREFIX = /usr/local @@ -63,5 +63,6 @@ prep() { case $1 in install) (prep; make; make install "PREFIX=$PREFIX" "MANDIR=$PREFIX/man/") ;; clean) (prep; make clean) ;; + deepclean) (rm -rf oed) ;; *) echo "usage: $0 install|clean"; false ;; esac @@ -14,7 +14,7 @@ prep() { } case $1 in - install) (prep; make generic "CC=cc" "MYCFLAGS=-Werror" && make install "INSTALL_TOP=$PREFIX") ;; + install) (prep; make generic "CC=x86_64-camellia-gcc" "MYCFLAGS=-Werror" && make install "INSTALL_TOP=$PREFIX") ;; clean) (prep; make clean) ;; *) echo "usage: $0 install|clean"; false ;; -esac
\ No newline at end of file +esac diff --git a/sysroot/usr/lib/libm.a b/sysroot/usr/lib/libm.a new file mode 120000 index 0000000..1c566f4 --- /dev/null +++ b/sysroot/usr/lib/libm.a @@ -0,0 +1 @@ +../../../out/libm.a
\ No newline at end of file |