From 436a3ecd89e8d05fd5a403f8dcd0bc8ae5125b18 Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Thu, 30 Jun 2016 23:33:40 -0700
Subject: The cmdwrap sh.exe hack is no longer needed.

The Cygnal library uses cmd.exe for popen:
problem solved.

* Makefile (sh.exe): Target removed.

* cmdwrap.c: File removed.

* inst.nsi: Do not install sh.exe.
---
 Makefile  |  5 -----
 cmdwrap.c | 17 -----------------
 inst.nsi  |  1 -
 3 files changed, 23 deletions(-)
 delete mode 100644 cmdwrap.c

diff --git a/Makefile b/Makefile
index 6cb88e3b..0c443a1d 100644
--- a/Makefile
+++ b/Makefile
@@ -468,8 +468,3 @@ conftest.clean:
 	$(V)rm -f conftest$(EXE) conftest.[co] \
 	conftest2$(EXE) conftest[12].[oc] \
 	conftest.err conftest.syms
-
-# rule for building the Cygwin /bin/sh -> cmd.exe wrapper
-
-sh.exe: cmdwrap.c
-	$(CC) -O -o $@ $^
diff --git a/cmdwrap.c b/cmdwrap.c
deleted file mode 100644
index 51e44b07..00000000
--- a/cmdwrap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <process.h>
-#include <stdlib.h>
-#include <string.h>
-
-int main(int argc, char **argv)
-{
-   if (argc != 3)
-     return EXIT_FAILURE;
-
-   if (strcmp(argv[1], "-c") != 0)
-     return EXIT_FAILURE;
-
-   argv[0] = "c:/Windows/System32/cmd.exe";
-   argv[1] = "/c";
-
-   return spawnvp(_P_WAIT, argv[0], (const char * const *) argv);
-}
diff --git a/inst.nsi b/inst.nsi
index 41a9691d..f89facd7 100644
--- a/inst.nsi
+++ b/inst.nsi
@@ -47,7 +47,6 @@ section "TXR"
   SetOutPath $INSTDIR\txr\bin
   File txr.exe
   File txr-win.exe
-  File sh.exe
   File c:\cygwin\bin\cygwin1.dll
   File c:\cygwin\bin\cyggcc_s-1.dll
   SetOutPath $INSTDIR\txr\doc
-- 
cgit v1.2.3