projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Be more careful when calculating the enclosing top level declaration of a srcspan
[ghc-hetmet.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
6f38c13
..
c935520
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-82,7
+82,13
@@
check-packages :
exit 1; \
fi
exit 1; \
fi
-stage1 : check-packages
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifneq "$(WhatGccIsCalled)" ""
+GCC_LIB_DEP = stamp.inplace-gcc-lib
+endif
+endif
+
+stage1 : $(GCC_LIB_DEP) check-packages
$(MAKE) -C utils/mkdependC boot
@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
for i in $(SUBDIRS_BUILD); do \
$(MAKE) -C utils/mkdependC boot
@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
for i in $(SUBDIRS_BUILD); do \
@@
-238,8
+244,6
@@
install-docs ::
# binary-dist is a GHC addition for binary distributions
#
# binary-dist is a GHC addition for binary distributions
#
-BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2
-
binary-dist::
-rm -rf $(BIN_DIST_DIR)
-$(RM) $(BIN_DIST_DIR).tar.gz
binary-dist::
-rm -rf $(BIN_DIST_DIR)
-$(RM) $(BIN_DIST_DIR).tar.gz
@@
-460,11
+464,11
@@
SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
#
# Files to include in source distributions
#
#
# Files to include in source distributions
#
-SRC_DIST_DIRS += mk docs distrib $(filter-out docs distrib,$(SUBDIRS))
+SRC_DIST_DIRS += mk docs distrib bindisttest $(filter-out docs distrib,$(SUBDIRS))
SRC_DIST_FILES += \
configure.ac config.guess config.sub configure \
aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \
SRC_DIST_FILES += \
configure.ac config.guess config.sub configure \
aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \
- ghc.spec.in VERSION
+ ghc.spec.in extra-gcc-opts.in VERSION boot
# -----------------------------------------------------------------------------
# Source distributions
# -----------------------------------------------------------------------------
# Source distributions
@@
-564,6
+568,9
@@
MAINTAINER_CLEAN_FILES += VERSION
extraclean::
$(RM) -rf autom4te.cache
extraclean::
$(RM) -rf autom4te.cache
+clean distclean ::
+ $(MAKE) -C bindisttest $@
+
# -----------------------------------------------------------------------------
# Turn off target.mk's rules for 'all', 'boot' and 'install'.
# -----------------------------------------------------------------------------
# Turn off target.mk's rules for 'all', 'boot' and 'install'.