diff options
| author | jochemberndsen@dse.nl <unknown> | 2007-09-26 20:37:50 +0000 |
|---|---|---|
| committer | jochemberndsen@dse.nl <unknown> | 2007-09-26 20:37:50 +0000 |
| commit | 3063e93f259af9f0d3771bdbabee86aabb8a3230 (patch) | |
| tree | 65d30c1d84b9d4355d0e83f047a31f5fb8d8cf02 /gmp | |
| parent | 00f6b1c9fc219f35c43d7103e202d3b74e0332f4 (diff) | |
| download | haskell-3063e93f259af9f0d3771bdbabee86aabb8a3230.tar.gz | |
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.
Diffstat (limited to 'gmp')
| -rw-r--r-- | gmp/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gmp/Makefile b/gmp/Makefile index 82de987dad..750dfb6c6c 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 \ |