From 1a1eb66fa0f4e6de6d06d80dae1bdce276fbd294 Mon Sep 17 00:00:00 2001
From: dzwdz
Date: Sat, 25 Feb 2023 18:31:16 +0100
Subject: ports: move to the new toolchain

---
 ports/bin/cc | 6 ------
 ports/doom   | 8 ++++----
 ports/ed     | 3 ++-
 ports/lua    | 4 ++--
 4 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100755 ports/bin/cc

(limited to 'ports')

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
diff --git a/ports/doom b/ports/doom
index 82db23e..7ef03dd 100644
--- a/ports/doom
+++ b/ports/doom
@@ -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 ;;
diff --git a/ports/ed b/ports/ed
index 87dd05c..8a83ae4 100644
--- a/ports/ed
+++ b/ports/ed
@@ -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
diff --git a/ports/lua b/ports/lua
index 6517954..46f995f 100644
--- a/ports/lua
+++ b/ports/lua
@@ -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
-- 
cgit v1.2.3