From: jochemberndsen@dse.nl <unknown>
Date: Wed, 26 Sep 2007 20:37:50 +0000 (+0000)
Subject: FIX BUILD `set -o igncr'-issue on FreeBSD
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=3063e93f259af9f0d3771bdbabee86aabb8a3230

FIX BUILD `set -o igncr'-issue on FreeBSD
`set -o igncr' does not work on non-cygwin-systems.
Fail silently if this command does not work, instead
of aborting the build.
---

diff --git a/gmp/Makefile b/gmp/Makefile
index 82de987..750dfb6 100644
--- a/gmp/Makefile
+++ b/gmp/Makefile
@@ -14,6 +14,11 @@ ifneq "$(HaveFrameworkGMP)" "YES"
 
 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
@@ -58,7 +63,7 @@ stamp.gmp.static:
 	$(TAR) -zxf $(GMP_TARBALL)
 	mv $(GMP_DIR) gmpbuild
 	chmod +x ln
-	set -o igncr; export SHELLOPTS; \
+	(set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
 	    export PATH=`pwd`:$$PATH; \
 	    cd gmpbuild && \
 	    CC=$(WhatGccIsCalled) $(SHELL) configure \
@@ -70,7 +75,7 @@ stamp.gmp.shared:
 	$(TAR) -zxf $(GMP_TARBALL)
 	mv $(GMP_DIR) gmpbuild-shared
 	chmod +x ln
-	set -o igncr; export SHELLOPTS; \
+	(set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
 	    export PATH=`pwd`:$$PATH; \
 	    cd gmpbuild-shared && \
 	    CC=$(WhatGccIsCalled) $(SHELL) configure \