diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-05-20 16:29:18 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-05-20 16:29:18 +0000 |
| commit | 5dce9c83865ab0dacb7f8414f6ff87e8d6c184ba (patch) | |
| tree | 9681444e9a851db08def48b817bcafa8d0cc1b2c /libffi | |
| parent | 78b2f856c526e4ae8f8e935b4333fcaf67e7ca84 (diff) | |
| download | haskell-5dce9c83865ab0dacb7f8414f6ff87e8d6c184ba.tar.gz | |
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
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ghc.mk | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/libffi/ghc.mk b/libffi/ghc.mk index d9b1c016d5..3e230530a0 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 && \ |