From bdefdc936a6c2be8f6c814c82ef9b36a432051e4 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Fri, 26 Apr 2019 00:36:06 -0700
Subject: Replace config.def.h with a configure script

---
 .builds/alpine.yml  | 15 +++++++++------
 .builds/debian.yml  | 14 +++++++++-----
 .builds/freebsd.yml | 39 ++++++++++-----------------------------
 3 files changed, 28 insertions(+), 40 deletions(-)

(limited to '.builds')

diff --git a/.builds/alpine.yml b/.builds/alpine.yml
index 71ed175..df36db3 100644
--- a/.builds/alpine.yml
+++ b/.builds/alpine.yml
@@ -1,9 +1,12 @@
 image: alpine/edge
 sources:
-  - https://git.sr.ht/~mcf/cc
-  - git://c9x.me/qbe.git
+- https://git.sr.ht/~mcf/cc
+- git://c9x.me/qbe.git
+environment:
+  PATH: $HOME/qbe/obj:$PATH
 tasks:
-  - build: |
-      make -C qbe
-      echo 'CFLAGS=-DDYNAMICLINKER=\"/lib/ld-musl-x86_64.so.1\"' >cc/config.mk
-      PATH=$PWD/qbe/obj:$PATH make -C cc all check bootstrap
+- build: |
+    make -C qbe
+    cd cc
+    ./configure
+    make all check bootstrap
diff --git a/.builds/debian.yml b/.builds/debian.yml
index bcba5fc..ac0eb97 100644
--- a/.builds/debian.yml
+++ b/.builds/debian.yml
@@ -1,8 +1,12 @@
 image: debian/stretch
 sources:
-  - https://git.sr.ht/~mcf/cc
-  - git://c9x.me/qbe.git
+- https://git.sr.ht/~mcf/cc
+- git://c9x.me/qbe.git
+environment:
+  PATH: $HOME/qbe/obj:$PATH
 tasks:
-  - build: |
-      make -C qbe
-      PATH=$PWD/qbe/obj:$PATH make -C cc all check bootstrap
+- build: |
+    make -C qbe
+    cd cc
+    ./configure
+    make all check bootstrap
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index 8eb359d..280081a 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -1,33 +1,14 @@
 image: freebsd/latest
 sources:
-  - https://git.sr.ht/~mcf/cc
-  - git://c9x.me/qbe.git
+- https://git.sr.ht/~mcf/cc
+- git://c9x.me/qbe.git
 packages:
-  - gmake
+- gmake
+environment:
+  PATH: $HOME/qbe/obj:$PATH
 tasks:
-  - build: |
-      gmake -C qbe
-      cd cc
-      cat >config.h <<EOF
-      static char *startfiles[] = {"-l", ":crt1.o", "-l", ":crti.o"};
-      static char *endfiles[] = {"-l", ":crtn.o", "-l", "c"};
-      static char *preprocesscmd[] = {
-      	"cpp", "-P",
-      	"-U", "__GNUC__", "-D", "__GNUC__=3",
-      	"-U", "__GNUC_MINOR__", "-D", "__GNUC_MINOR__=3",
-      	"-D", "__asm(x)=",
-      	"-D", "__attribute__(x)=",
-      	"-D", "__inline=",
-      	"-D", "_Pragma(x)=",
-      	"-D", "_Nullable=",
-      	"-D", "_Nonnull=",
-      	"-D", "_XLOCALE_INLINE=static inline",
-      	"-D", "__NO_TLS",
-      };
-      static char *compilecmd[] = {"cc-qbe"};
-      static char *codegencmd[] = {"qbe"};
-      static char *assemblecmd[] = {"as"};
-      static char *linkcmd[] = {"ld", "-L", "/usr/lib", "--dynamic-linker", "/libexec/ld-elf.so.1"};
-      EOF
-      echo 'CFLAGS=-Wno-parentheses -Wno-switch' >config.mk
-      PATH=$HOME/qbe/obj:$PATH make all check bootstrap
+- build: |
+    gmake -C qbe
+    cd cc
+    ./configure
+    make all check bootstrap
-- 
cgit v1.2.3