Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Alex D
GHC
Commits
cd12c32d
Commit
cd12c32d
authored
May 14, 2009
by
Simon Marlow
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make repeated 'make distclean' not fail
parent
e4b74d50
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
2 deletions
+15
-2
Makefile
Makefile
+4
-1
ghc.mk
ghc.mk
+8
-1
rules/build-prog.mk
rules/build-prog.mk
+3
-0
No files found.
Makefile
View file @
cd12c32d
...
...
@@ -32,11 +32,14 @@ else
default
:
all
@
:
ifneq
"$(findstring clean,$(MAKECMDGOALS))" ""
-include
mk/config.mk
else
include
mk/config.mk
ifeq
"$(ProjectVersion)" ""
$(error
Please
run
./configure
first)
endif
endif
include
mk/custom-settings.mk
...
...
ghc.mk
View file @
cd12c32d
...
...
@@ -134,18 +134,23 @@ show:
# -----------------------------------------------------------------------------
# Include subsidiary build-system bits
ifneq
"$(findstring clean,$(MAKECMDGOALS))" ""
-include
mk/config.mk
else
include
mk/config.mk
ifeq
"$(ProjectVersion)" ""
$(error
Please
run
./configure
first)
endif
endif
# (Optional) build-specific configuration
include
mk/custom-settings.mk
ifeq
"$(findstring clean,$(MAKECMDGOALS))" ""
ifeq
"$(GhcLibWays)" ""
$(error
$$(GhcLibWays)
is
empty,
it
must
contain
at
least
one
way)
endif
endif
# -----------------------------------------------------------------------------
# Macros for standard targets
...
...
@@ -559,9 +564,11 @@ libraries/base3-compat_dist-install_HC_OPTS += -XPackageImports
ifneq
"$(BINDIST)" "YES"
ifneq
"$(BOOTSTRAPPING_CONF)" ""
ifeq
"$(wildcard $(BOOTSTRAPPING_CONF))" ""
$(shell
echo
"[]"
>$(BOOTSTRAPPING_CONF))
endif
endif
$(eval
$(call
clean-target,$(BOOTSTRAPPING_CONF),,$(BOOTSTRAPPING_CONF)))
...
...
rules/build-prog.mk
View file @
cd12c32d
...
...
@@ -128,10 +128,13 @@ endif
$(call
all-target,$1_$2,$$($1_$2_INPLACE))
$(call
clean-target,$1,$2_inplace,$$($1_$2_INPLACE))
# INPLACE_BIN might be empty if we're distcleaning
ifneq
"$$(INPLACE_BIN)" ""
$$($1_$2_INPLACE)
:
$1/$2/build/tmp/$$($1_$2_PROG) $$(MKDIRHIER)
$
$(MKDIRHIER)
$
$(
dir
$$
@
)
$
$(CP)
-p
$$
<
$$
@
touch
$$
@
endif
# touch is necessary; cp doesn't update the file time.
endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment