projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX #1977: Check to see if $(bindir) is in the path
[ghc-hetmet.git]
/
gmp
/
Makefile
diff --git
a/gmp/Makefile
b/gmp/Makefile
index
82de987
..
ab661d9
100644
(file)
--- a/
gmp/Makefile
+++ b/
gmp/Makefile
@@
-14,6
+14,11
@@
ifneq "$(HaveFrameworkGMP)" "YES"
PLATFORM := $(shell echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g')
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
# 2007-07-05
# We do
# set -o igncr; export SHELLOPTS
@@
-40,25
+45,25
@@
BUILD_SHARED=no
endif
boot :: stamp.gmp.static
endif
boot :: stamp.gmp.static
-all :: gmp.h libgmp.a
-install :: gmp.h libgmp.a
+BINDIST_STAMPS = stamp.gmp.static
INSTALL_HEADERS += gmp.h
INSTALL_LIBS += libgmp.a
ifeq "$(BUILD_SHARED)" "yes"
boot :: stamp.gmp.shared
INSTALL_HEADERS += gmp.h
INSTALL_LIBS += libgmp.a
ifeq "$(BUILD_SHARED)" "yes"
boot :: stamp.gmp.shared
-all :: libgmp-3.dll libgmp.dll.a
-install :: libgmp-3.dll libgmp.dll.a
+BINDIST_STAMPS += stamp.gmp.shared
INSTALL_LIBS += libgmp.dll.a
INSTALL_PROGS += libgmp-3.dll
endif
INSTALL_LIBS += libgmp.dll.a
INSTALL_PROGS += libgmp-3.dll
endif
+install all :: $(INSTALL_HEADERS) $(INSTALL_LIBS) $(INSTALL_PROGS)
+
stamp.gmp.static:
$(RM) -rf $(GMP_DIR) gmpbuild
$(TAR) -zxf $(GMP_TARBALL)
mv $(GMP_DIR) gmpbuild
chmod +x ln
stamp.gmp.static:
$(RM) -rf $(GMP_DIR) gmpbuild
$(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 \
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
$(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 \
export PATH=`pwd`:$$PATH; \
cd gmpbuild-shared && \
CC=$(WhatGccIsCalled) $(SHELL) configure \
@@
-94,10
+99,15
@@
libgmp.dll.a: libgmp-3.dll
endif
endif
endif
endif
+# GMP takes a long time to build, but changes rarely. Hence we don't
+# bother cleaning it before validating, because that adds a
+# significant overhead to validation.
+ifeq "$(Validating)" "NO"
clean distclean maintainer-clean ::
$(RM) -f stamp.gmp.static stamp.gmp.shared
$(RM) -rf gmpbuild
$(RM) -rf gmpbuild-shared
clean distclean maintainer-clean ::
$(RM) -f stamp.gmp.static stamp.gmp.shared
$(RM) -rf gmpbuild
$(RM) -rf gmpbuild-shared
+endif
#-----------------------------------------------------------------------------
#
#-----------------------------------------------------------------------------
#
@@
-106,22
+116,20
@@
clean distclean maintainer-clean ::
include $(TOP)/mk/target.mk
binary-dist:
include $(TOP)/mk/target.mk
binary-dist:
- @:
-ifneq "$(HaveLibGmp)" "YES"
-ifneq "$(HaveFrameworkGMP)" "YES"
$(INSTALL_DIR) $(BIN_DIST_DIR)/gmp
$(INSTALL_DIR) $(BIN_DIST_DIR)/gmp
- touch $(BIN_DIST_DIR)/gmp/$(GMP_TARBALL)
$(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/gmp/
$(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/gmp/
-ifneq "$(INSTALL_PROGS)" ""
+ifneq "$(HaveLibGmp)" "YES"
+ ifneq "$(HaveFrameworkGMP)" "YES"
+ $(INSTALL_DATA) $(BINDIST_STAMPS) $(BIN_DIST_DIR)/gmp/
+ ifneq "$(INSTALL_PROGS)" ""
$(INSTALL_DATA) $(INSTALL_PROGS) $(BIN_DIST_DIR)/gmp/
$(INSTALL_DATA) $(INSTALL_PROGS) $(BIN_DIST_DIR)/gmp/
-endif
-ifneq "$(INSTALL_LIBS)" ""
+ endif
+ ifneq "$(INSTALL_LIBS)" ""
$(INSTALL_DATA) $(INSTALL_LIBS) $(BIN_DIST_DIR)/gmp/
$(INSTALL_DATA) $(INSTALL_LIBS) $(BIN_DIST_DIR)/gmp/
-endif
-ifneq "$(INSTALL_HEADERS)" ""
+ endif
+ ifneq "$(INSTALL_HEADERS)" ""
$(INSTALL_HEADER) $(INSTALL_HEADERS) $(BIN_DIST_DIR)/gmp/
$(INSTALL_HEADER) $(INSTALL_HEADERS) $(BIN_DIST_DIR)/gmp/
-endif
-
-endif
+ endif
+ endif
endif
endif