projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use cp -R rather than cp -a for portability reasons
[ghc-hetmet.git]
/
libraries
/
Makefile
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
82cf02e
..
e0ecc62
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-56,6
+56,12
@@
endif
empty=
space=$(empty) $(empty)
empty=
space=$(empty) $(empty)
+ifeq "$(Windows)" "YES"
+dot_bat=.bat
+else
+dot_bat=
+endif
+
CONFIGURE_OPTS =
CONFIGURE_STAMP_EXTRAS :=
CONFIGURE_OPTS =
CONFIGURE_STAMP_EXTRAS :=
@@
-93,7
+99,7
@@
$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \
stamp/$(BOOTSTRAPPING_CABAL):
$(RM) -rf $(BOOTSTRAPPING_CABAL)
stamp/$(BOOTSTRAPPING_CABAL):
$(RM) -rf $(BOOTSTRAPPING_CABAL)
- $(CP) -a Cabal $(BOOTSTRAPPING_CABAL)
+ $(CP) -R Cabal $(BOOTSTRAPPING_CABAL)
$(FIND) $(BOOTSTRAPPING_CABAL) \( -name "*.o" -o -name "*.hi" \) -exec $(RM) -f {} \;
touch $@
$(FIND) $(BOOTSTRAPPING_CABAL) \( -name "*.o" -o -name "*.hi" \) -exec $(RM) -f {} \;
touch $@
@@
-122,10
+128,13
@@
stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
cd $* && setup/Setup configure \
$(CONFIGURE_OPTS) \
--prefix=$(prefix) \
cd $* && setup/Setup configure \
$(CONFIGURE_OPTS) \
--prefix=$(prefix) \
- --with-compiler=../../compiler/ghc-inplace \
- --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \
+ --with-compiler=../../compiler/ghc-inplace$(dot_bat) \
+ --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$(dot_bat) \
+ --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace$(dot_bat) \
+ --with-ld=$(LD) \
--datasubdir=ghc \
--datasubdir=ghc \
- --haddock-args="--use-contents=../index.html --use-index=../doc-index.html"
+ --haddock-args="--use-contents=../index.html --use-index=../doc-index.html" \
+ --configure-option=--with-cc=$(CC)
touch $@
$(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\
touch $@
$(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\