From 244566ccd48f8cbe78bce5e84e28e13357701979 Mon Sep 17 00:00:00 2001
From: Calvin Rose <calsrose@gmail.com>
Date: Tue, 31 Mar 2020 07:50:40 -0500
Subject: [PATCH] Remove manual feature definitions in boot.

Instead, reuse features as defined in features.h
---
 CHANGELOG.md        |  2 +-
 README.md           |  4 ++--
 src/boot/boot.janet | 12 +++++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27cfe841..4d78abaf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## 1.8.1 - 2020-03-30
+## 1.8.1 - 2020-03-31
 - Fix bugs for big endian systems
 - Fix 1.8.0 regression on BSDs
 
diff --git a/README.md b/README.md
index f8117569..99405ec4 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,8 @@
 &nbsp;
 [![Appveyor Status](https://ci.appveyor.com/api/projects/status/bjraxrxexmt3sxyv/branch/master?svg=true)](https://ci.appveyor.com/project/bakpakin/janet/branch/master)
 [![Build Status](https://travis-ci.org/janet-lang/janet.svg?branch=master)](https://travis-ci.org/janet-lang/janet)
-[![builds.sr.ht status](https://builds.sr.ht/~bakpakin/janet/.freebsd.yaml.svg)](https://builds.sr.ht/~bakpakin/janet/.freebsd.yaml?)
-[![builds.sr.ht status](https://builds.sr.ht/~bakpakin/janet/.openbsd.yaml.svg)](https://builds.sr.ht/~bakpakin/janet/.openbsd.yaml?)
+[![builds.sr.ht status](https://builds.sr.ht/~bakpakin/janet/freebsd.yaml.svg)](https://builds.sr.ht/~bakpakin/janet/freebsd.yaml?)
+[![builds.sr.ht status](https://builds.sr.ht/~bakpakin/janet/openbsd.yaml.svg)](https://builds.sr.ht/~bakpakin/janet/openbsd.yaml?)
 
 <img src="https://raw.githubusercontent.com/janet-lang/janet/master/assets/janet-w200.png" alt="Janet logo" width=200 align="left">
 
diff --git a/src/boot/boot.janet b/src/boot/boot.janet
index 4ddbbef2..468da4a5 100644
--- a/src/boot/boot.janet
+++ b/src/boot/boot.janet
@@ -2528,9 +2528,10 @@
 
   # Create amalgamation
 
+  (def feature-header "src/core/features.h")
+
   (def local-headers
-    ["src/core/features.h"
-     "src/core/util.h"
+    ["src/core/util.h"
      "src/core/state.h"
      "src/core/gc.h"
      "src/core/vector.h"
@@ -2584,9 +2585,6 @@
   (print "/* Generated from janet version " janet/version "-" janet/build " */")
   (print "#define JANET_BUILD \"" janet/build "\"")
   (print ```#define JANET_AMALG```)
-  (print ```#define _POSIX_C_SOURCE 200112L```)
-  (print ```#define _XOPEN_SOURCE 500```)
-  (print ```#include "janet.h"```)
 
   (defn do-one-flie
     [fname]
@@ -2595,6 +2593,10 @@
     (def source (slurp fname))
     (print (string/replace-all "\r" "" source)))
 
+  (do-one-flie feature-header)
+
+  (print ```#include "janet.h"```)
+
   (each h local-headers
     (do-one-flie h))