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
da22bc8b
Commit
da22bc8b
authored
May 30, 2009
by
Ian Lynagh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
$(XARGS) might include arguments, so don't quote it in makefiles
parent
0ef6ba7b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
rts/ghc.mk
rts/ghc.mk
+1
-1
rules/build-package-way.mk
rules/build-package-way.mk
+2
-2
No files found.
rts/ghc.mk
View file @
da22bc8b
...
...
@@ -160,7 +160,7 @@ $$(rts_$1_LIB) : $$(rts_$1_OBJS) rts/libs.depend
else
$$(rts_$1_LIB)
:
$$(rts_$1_OBJS)
"
$
$(RM)
"
$
$(RM_OPTS)
$$
@
echo
$$
(
rts_
$1_OBJS
)
|
"
$
$(XARGS)
"
$
$(AR)
$
$(EXTRA_AR_ARGS)
$$
@
echo
$$
(
rts_
$1_OBJS
)
|
$
$(XARGS)
$
$(AR)
$
$(EXTRA_AR_ARGS)
$$
@
endif
endef
...
...
rules/build-package-way.mk
View file @
da22bc8b
...
...
@@ -52,11 +52,11 @@ else
ifeq
"$$($1_$2_SplitObjs)" "YES"
$$($1_$2_$3_LIB)
:
$$($1_$2_$3_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS)
"
$
$(RM)
"
$
$(RM_OPTS)
$$
@
(
echo
$$
(
$1_$2_v_C_OBJS
)
$$
(
$1_$2_v_S_OBJS
)
`
$$
(
$1_$2_$3_MKSTUBOBJS
)
`
;
find
$
$(
patsubst
%.
$$
(
$3_osuf
)
,%_split,
$$
(
$1_$2_$3_HS_OBJS
))
-name
'*.$$($3_osuf)'
-print
)
|
"
$
$(XARGS)
"
$
$(AR)
$
$(EXTRA_AR_ARGS)
$$
@
||
"
$
$(RM)
"
$
$(RM_OPTS)
$$
@
(
echo
$$
(
$1_$2_v_C_OBJS
)
$$
(
$1_$2_v_S_OBJS
)
`
$$
(
$1_$2_$3_MKSTUBOBJS
)
`
;
find
$
$(
patsubst
%.
$$
(
$3_osuf
)
,%_split,
$$
(
$1_$2_$3_HS_OBJS
))
-name
'*.$$($3_osuf)'
-print
)
|
$
$(XARGS)
$
$(AR)
$
$(EXTRA_AR_ARGS)
$$
@
||
"
$
$(RM)
"
$
$(RM_OPTS)
$$
@
else
$$($1_$2_$3_LIB)
:
$$($1_$2_$3_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS)
"
$
$(RM)
"
$
$(RM_OPTS)
$$
@
echo
$$
(
$1_$2_v_C_OBJS
)
$$
(
$1_$2_v_S_OBJS
)
$$
(
$1_$2_$3_HS_OBJS
)
`
$$
(
$1_$2_$3_MKSTUBOBJS
)
`
|
"
$
$(XARGS)
"
$
$(AR)
$
$(EXTRA_AR_ARGS)
$$
@
||
"
$
$(RM)
"
$
$(RM_OPTS)
$$
@
echo
$$
(
$1_$2_v_C_OBJS
)
$$
(
$1_$2_v_S_OBJS
)
$$
(
$1_$2_$3_HS_OBJS
)
`
$$
(
$1_$2_$3_MKSTUBOBJS
)
`
|
$
$(XARGS)
$
$(AR)
$
$(EXTRA_AR_ARGS)
$$
@
||
"
$
$(RM)
"
$
$(RM_OPTS)
$$
@
endif
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