Commit e717ed30 authored by Ian Lynagh's avatar Ian Lynagh

Tweak the cleaning of inplace/; fixes trac #4320

parent 3d290c13
...@@ -387,6 +387,8 @@ FP_FIND_ROOT ...@@ -387,6 +387,8 @@ FP_FIND_ROOT
if test "$HostOS" = "mingw32" if test "$HostOS" = "mingw32"
then then
test -d inplace || mkdir inplace
CC="$hardtop/inplace/mingw/bin/gcc.exe" CC="$hardtop/inplace/mingw/bin/gcc.exe"
LD="$hardtop/inplace/mingw/bin/ld.exe" LD="$hardtop/inplace/mingw/bin/ld.exe"
NM="$hardtop/inplace/mingw/bin/nm.exe" NM="$hardtop/inplace/mingw/bin/nm.exe"
...@@ -404,7 +406,6 @@ then ...@@ -404,7 +406,6 @@ then
then then
AC_MSG_NOTICE([Making in-tree mingw tree]) AC_MSG_NOTICE([Making in-tree mingw tree])
rm -rf inplace/mingw rm -rf inplace/mingw
test -d inplace || mkdir inplace
mkdir inplace/mingw mkdir inplace/mingw
( (
cd inplace/mingw && cd inplace/mingw &&
......
...@@ -155,7 +155,7 @@ include rules/clean-target.mk ...@@ -155,7 +155,7 @@ include rules/clean-target.mk
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# The inplace tree # The inplace tree
$(eval $(call clean-target,inplace,,inplace)) $(eval $(call clean-target,inplace,,inplace/bin inplace/lib))
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Whether to build dependencies or not # Whether to build dependencies or not
...@@ -1254,6 +1254,7 @@ distclean : clean ...@@ -1254,6 +1254,7 @@ distclean : clean
"$(RM)" $(RM_OPTS) libraries/unix/include/HsUnixConfig.h "$(RM)" $(RM_OPTS) libraries/unix/include/HsUnixConfig.h
"$(RM)" $(RM_OPTS) libraries/old-time/include/HsTimeConfig.h "$(RM)" $(RM_OPTS) libraries/old-time/include/HsTimeConfig.h
"$(RM)" $(RM_OPTS_REC) utils/ghc-pwd/dist "$(RM)" $(RM_OPTS_REC) utils/ghc-pwd/dist
"$(RM)" $(RM_OPTS_REC) inplace
"$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/config.log, $(PACKAGES) $(PACKAGES_STAGE2)) "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/config.log, $(PACKAGES) $(PACKAGES_STAGE2))
"$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/config.status, $(PACKAGES) $(PACKAGES_STAGE2)) "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/config.status, $(PACKAGES) $(PACKAGES_STAGE2))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment