Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Alex D
GHC
Commits
fe05c022
Commit
fe05c022
authored
Dec 03, 2011
by
Ian Lynagh
Browse files
Remove some unnecessary touch's
They made a dependency cycle in the rules used to build the touch program on Windows.
parent
4fb39037
Changes
2
Hide whitespace changes
Inline
Side-by-side
rules/build-dependencies.mk
View file @
fe05c022
...
...
@@ -31,9 +31,8 @@ ifneq "$$(NO_GENERATED_MAKEFILE_RULES)" "YES"
# indirectly) include the generated includes files.
$$($1_$2_depfile_haskell)
:
$$(includes_H_CONFIG) $$(includes_H_PLATFORM)
$$($1_$2_depfile_haskell)
:
$$($1_$2_HS_SRCS) $$($1_$2_HS_BOOT_SRCS) $$($1_$2_HC_MK_DEPEND_DEP)
$$(TOUCH_DEP)
| $$$$(dir $$$$@)/.
$$($1_$2_depfile_haskell)
:
$$($1_$2_HS_SRCS) $$($1_$2_HS_BOOT_SRCS) $$($1_$2_HC_MK_DEPEND_DEP) | $$$$(dir $$$$@)/.
$
$(
call
removeFiles,
$$
@.tmp
)
"
$
$(TOUCH_CMD)
"
$$
@.tmp
ifneq
"$$($1_$2_HS_SRCS)" ""
"
$$
(
$1_$2_HC_MK_DEPEND
)"
-M
$$
(
$1_$2_MKDEPENDHS_FLAGS
)
\
$
$(
filter-out
-split-objs
,
$$
(
$1_$2_v_ALL_HC_OPTS
))
\
...
...
@@ -54,9 +53,8 @@ endif
# includes files.
$$($1_$2_depfile_c_asm)
:
$$(includes_H_CONFIG) $$(includes_H_PLATFORM)
$$($1_$2_depfile_c_asm)
:
$$($1_$2_C_FILES_DEPS) $$($1_$2_S_FILES)
$$(TOUCH_DEP)
| $$$$(dir $$$$@)/.
$$($1_$2_depfile_c_asm)
:
$$($1_$2_C_FILES_DEPS) $$($1_$2_S_FILES) | $$$$(dir $$$$@)/.
$
$(
call
removeFiles,
$$
@.tmp
)
"
$
$(TOUCH_CMD)
"
$$
@.tmp
ifneq
"$$(strip $$($1_$2_C_FILES_DEPS)$$($1_$2_S_FILES))" ""
# We ought to actually do this for each way in $$($1_$2_WAYS), but then
# it takes a long time to make the C deps for the RTS (30 seconds rather
...
...
rules/build-prog.mk
View file @
fe05c022
...
...
@@ -94,9 +94,8 @@ $(call all-target,$1_$2,$1/$2/build/tmp/$$($1_$2_PROG))
# INPLACE_BIN might be empty if we're distcleaning
ifeq
"$(findstring clean,$(MAKECMDGOALS))" ""
ifneq
"$$($1_$2_INSTALL_INPLACE)" "NO"
$$($1_$2_INPLACE)
:
$1/$2/build/tmp/$$($1_$2_PROG)
$$(TOUCH_DEP)
| $$$$(dir $$$$@)/.
$$($1_$2_INPLACE)
:
$1/$2/build/tmp/$$($1_$2_PROG) | $$$$(dir $$$$@)/.
"
$
$(CP)
"
-p
$$
<
$$
@
"
$
$(TOUCH_CMD)
"
$$
@
endif
endif
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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