From: Ian Lynagh <igloo@earth.li>
Date: Thu, 20 May 2010 16:29:18 +0000 (+0000)
Subject: Don't run "set -o igncr" before configuring libffi
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=5dce9c83865ab0dacb7f8414f6ff87e8d6c184ba

Don't run "set -o igncr" before configuring libffi
It used to make the build work on cygwin, but now it breaks it instead:
    config.status: creating include/Makefile
    gawk: ./confLqjohp/subs.awk:1: BEGIN {\r
    gawk: ./confLqjohp/subs.awk:1: ^ backslash not last character on line
    config.status: error: could not create include/Makefile
    make[2]: *** [libffi/stamp.ffi.configure-shared] Error 1
    make[1]: *** [all] Error 2
---

diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index d9b1c01..3e23053 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -36,19 +36,6 @@
 
 PLATFORM := $(shell echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g')
 
-# 2007-09-26
-#     set -o igncr 
-# is not a valid command on non-Cygwin-systems.
-# Let it fail silently instead of aborting the build.
-#
-# 2007-07-05
-# We do
-#     set -o igncr; export SHELLOPTS
-# here as otherwise checking the size of limbs
-# makes the build fall over on Cygwin. See the thread
-# http://www.cygwin.com/ml/cygwin/2006-12/msg00011.html
-# for more details.
-
 # 2007-07-05
 # Passing
 #     as_ln_s='cp -p'
@@ -122,7 +109,6 @@ $(libffi_STAMP_CONFIGURE):
 # Because -Werror may be in SRC_CC_OPTS/SRC_LD_OPTS, we need to turn
 # warnings off or the compilation of libffi might fail due to warnings
 	cd libffi && \
-	  (set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
 	    PATH=`pwd`:$$PATH; \
 	    export PATH; \
 	    cd build && \