Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
GHC
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexander Kaznacheev
GHC
Commits
fe05c022
Commit
fe05c022
authored
13 years ago
by
Ian Lynagh
Browse files
Options
Downloads
Patches
Plain Diff
Remove some unnecessary touch's
They made a dependency cycle in the rules used to build the touch program on Windows.
parent
4fb39037
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
rules/build-dependencies.mk
+2
-4
2 additions, 4 deletions
rules/build-dependencies.mk
rules/build-prog.mk
+1
-2
1 addition, 2 deletions
rules/build-prog.mk
with
3 additions
and
6 deletions
rules/build-dependencies.mk
+
2
−
4
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
...
...
This diff is collapsed.
Click to expand it.
rules/build-prog.mk
+
1
−
2
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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment