>From f008438531a98980b272e6b37ce9911339ca74f1 Mon Sep 17 00:00:00 2001
From: Evan Hanson <address@hidden>
Date: Tue, 27 Feb 2018 22:19:26 +1300
Subject: [PATCH] Adjust `build-platform' and `software-version' values for
 Cygwin

This changes the platform reporting for Cygwin as follows:

  (build-platform)   ; => clang, gnu, or unknown (was cygwin)
  (software-version) ; => cygwin (was unknown)

These differences are intended to reflect the fact that Cygwin can build
software with either the GNU compiler toolchain or Clang, and that the
runtime platform is known to be Cygwin.
---
 chicken.h   | 6 +++---
 csc.scm     | 2 +-
 eval.scm    | 2 +-
 library.scm | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/chicken.h b/chicken.h
index 150736c4..e0dc87fc 100644
--- a/chicken.h
+++ b/chicken.h
@@ -680,9 +680,7 @@ void *alloca ();
 # define C_SOFTWARE_TYPE "unknown"
 #endif
 
-#if defined(__CYGWIN__)
-# define C_BUILD_PLATFORM "cygwin"
-#elif defined(__SUNPRO_C)
+#if defined(__SUNPRO_C)
 # define C_BUILD_PLATFORM "sun"
 #elif defined(__MINGW32__)
 # define C_BUILD_PLATFORM "mingw32"
@@ -724,6 +722,8 @@ void *alloca ();
 # define C_SOFTWARE_VERSION "aix"
 #elif defined(__GNU__)
 # define C_SOFTWARE_VERSION "hurd"
+#elif defined(__CYGWIN__)
+# define C_SOFTWARE_VERSION "cygwin"
 #else
 # define C_SOFTWARE_VERSION "unknown"
 #endif
diff --git a/csc.scm b/csc.scm
index 333efcd5..40096ce8 100644
--- a/csc.scm
+++ b/csc.scm
@@ -65,7 +65,7 @@
 
 (define mingw (eq? (build-platform) 'mingw32))
 (define osx (eq? (software-version) 'macosx))
-(define cygwin (eq? (build-platform) 'cygwin))
+(define cygwin (eq? (software-version) 'cygwin))
 (define aix (eq? (build-platform) 'aix))
 
 (define elf
diff --git a/eval.scm b/eval.scm
index 8df126ef..1a8c056b 100644
--- a/eval.scm
+++ b/eval.scm
@@ -953,7 +953,7 @@
     srfi-16 srfi-17 srfi-26 srfi-31 srfi-55 srfi-88)) ; syntax cont
 
 (define default-dynamic-load-libraries
-  (case (build-platform)
+  (case (software-version)
     ((cygwin) cygwin-default-dynamic-load-libraries)
     (else `(,(string-append "lib" install-lib-name)))))
 
diff --git a/library.scm b/library.scm
index cd71a216..47fb56ec 100644
--- a/library.scm
+++ b/library.scm
@@ -6434,7 +6434,7 @@ static C_word C_fcall C_setenv(C_word x, C_word y) {
 (define ##sys#windows-platform
   (and (eq? 'windows (software-type))
        ;; Still windows even if 'Linux-like'
-       (not (eq? 'cygwin (build-platform)))))
+       (not (eq? 'cygwin (software-version)))))
 
 (define (chicken-version #!optional full)
   (define (get-config)
-- 
2.11.0