projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a bug to do with recursive modules in one-shot mode
[ghc-hetmet.git]
/
gmp
/
Makefile
diff --git
a/gmp/Makefile
b/gmp/Makefile
index
ab661d9
..
8f2097c
100644
(file)
--- a/
gmp/Makefile
+++ b/
gmp/Makefile
@@
-36,7
+36,6
@@
PLATFORM := $(shell echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g')
GMP_TARBALL := $(firstword $(wildcard gmp*.tar.gz))
GMP_DIR := $(subst .tar.gz,,$(GMP_TARBALL))
GMP_TARBALL := $(firstword $(wildcard gmp*.tar.gz))
GMP_DIR := $(subst .tar.gz,,$(GMP_TARBALL))
-BMP_BUILD_DIR := build
ifeq "$(findstring dyn, $(GhcRTSWays))" "dyn"
BUILD_SHARED=yes
ifeq "$(findstring dyn, $(GhcRTSWays))" "dyn"
BUILD_SHARED=yes
@@
-64,7
+63,8
@@
stamp.gmp.static:
mv $(GMP_DIR) gmpbuild
chmod +x ln
(set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
mv $(GMP_DIR) gmpbuild
chmod +x ln
(set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
- export PATH=`pwd`:$$PATH; \
+ PATH=`pwd`:$$PATH; \
+ export PATH; \
cd gmpbuild && \
CC=$(WhatGccIsCalled) $(SHELL) configure \
--enable-shared=no --host=$(PLATFORM) --build=$(PLATFORM)
cd gmpbuild && \
CC=$(WhatGccIsCalled) $(SHELL) configure \
--enable-shared=no --host=$(PLATFORM) --build=$(PLATFORM)
@@
-76,7
+76,8
@@
stamp.gmp.shared:
mv $(GMP_DIR) gmpbuild-shared
chmod +x ln
(set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
mv $(GMP_DIR) gmpbuild-shared
chmod +x ln
(set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
- export PATH=`pwd`:$$PATH; \
+ PATH=`pwd`:$$PATH; \
+ export PATH; \
cd gmpbuild-shared && \
CC=$(WhatGccIsCalled) $(SHELL) configure \
--enable-shared=yes --disable-static --host=$(PLATFORM) --build=$(PLATFORM)
cd gmpbuild-shared && \
CC=$(WhatGccIsCalled) $(SHELL) configure \
--enable-shared=yes --disable-static --host=$(PLATFORM) --build=$(PLATFORM)