From 975f7df4d8f0541ede4f525714560abffb2d5ef4 Mon Sep 17 00:00:00 2001
From: WeebDataHoarder <57538841+weebdatahoarder@users.noreply.github.com>
Date: Wed, 6 Jan 2021 10:08:32 +0100
Subject: [PATCH] Remove TCC from debian jessie and fedora, fix alpine, fix
 void

---
 .drone.jsonnet | 12 ++++++------
 Makefile       |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index e7c0a68..7545c65 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -43,11 +43,11 @@ local AptPipeline(image, version, arch, extra="", gccExtra="gcc", clangExtra="cl
 
 local PacManPipeline(image, version, arch, extra="", gccExtra="gcc", clangExtra="clang", tccExtra="tcc") = Pipeline(image, version, arch, "pacman -Syy && pacman --noconfirm -S", extra, gccExtra, clangExtra, tccExtra);
 
-local ApkPipeline(image, version, arch, extra="musl-dev linux-headers", gccExtra="gcc", clangExtra="gcc clang", tccExtra="tcc") = Pipeline(image, version, arch, "apk add --update", extra, gccExtra, clangExtra, tccExtra);
+local ApkPipeline(image, version, arch, extra="musl-dev linux-headers", gccExtra="gcc", clangExtra="gcc clang", tccExtra="") = Pipeline(image, version, arch, "apk add --update", extra, gccExtra, clangExtra, tccExtra);
 
 local YumPipeline(image, version, arch, extra="", gccExtra="gcc", clangExtra="clang", tccExtra="") = Pipeline(image, version, arch, "yum install -y", extra, gccExtra, clangExtra, tccExtra);
 
-local XbpsPipeline(image, version, arch, extra="", gccExtra="gcc", clangExtra="clang", tccExtra="tcc kernel-libc-headers") = Pipeline(image, version, arch, "xbps-install -Sy", extra, gccExtra, clangExtra, tccExtra);
+local XbpsPipeline(image, version, arch, extra="", gccExtra="gcc", clangExtra="clang", tccExtra="tcc glibc-devel") = Pipeline(image, version, arch, "xbps-install -Sy", extra, gccExtra, clangExtra, tccExtra);
 
 #
 
@@ -63,19 +63,19 @@ local XbpsPipeline(image, version, arch, extra="", gccExtra="gcc", clangExtra="c
 
   AptPipeline("debian", "stretch", "amd64"),
 
-  AptPipeline("debian", "jessie", "amd64"),
+  AptPipeline("debian", "jessie", "amd64", "", "gcc", "clang", ""),
 
 
 
-  YumPipeline("fedora", "latest", "amd64"),
+  YumPipeline("fedora", "latest", "amd64", "", "gcc", "clang", ""),
   YumPipeline("fedora", "latest", "arm64"),
 
 
   PacManPipeline("archlinux", "latest", "amd64"),
 
 
-  ApkPipeline("alpine", "edge", "amd64"),
-  ApkPipeline("alpine", "edge", "arm64"),
+  ApkPipeline("alpine", "latest", "amd64"),
+  ApkPipeline("alpine", "latest", "arm64"),
 
 
   XbpsPipeline("voidlinux/voidlinux", "latest", "amd64"),
diff --git a/Makefile b/Makefile
index 52007de..6681706 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ CFLAGS=-ggdb -Wall -Werror -pedantic -Wno-unknown-pragmas -Wno-packed-bitfield-c
 ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang version"), 1)
 	CFLAGS += -O0 -std=gnu99 -Wno-unknown-warning-option
 else ifeq ($(shell $(CC) -v 2>&1 | grep -c "tcc version"), 1)
-    CFLAGS += -std=c99
+    CFLAGS += -std=c99 -Wno-macro-redefined
 else
 	CFLAGS += -Og -std=gnu99
 endif