Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Tobias Decking
GHC
Commits
2440b61a
Commit
2440b61a
authored
Nov 07, 2009
by
Ian Lynagh
Browse files
Split XARGS into XARGS and XARGS_OPTS
parent
758c25ec
Changes
3
Hide whitespace changes
Inline
Side-by-side
mk/config.mk.in
View file @
2440b61a
...
...
@@ -618,10 +618,9 @@ LdIsGNULd = @LdIsGNULd@
# ar: Bad file number
# see #3201. We need to specify a smaller max command-line size
# to work around it. 32767 doesn't work; 30000 does.
ifeq
"$(Windows)" "YES"
XARGS
=
xargs
-s
30000
else
XARGS
=
xargs
ifeq
"$(Windows)" "YES"
XARGS_OPTS
=
-s
30000
endif
#
...
...
rts/ghc.mk
View file @
2440b61a
...
...
@@ -114,7 +114,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)
"
$
$(AR_OPTS)
$
$(EXTRA_AR_ARGS)
$$
@
echo
$$
(
rts_
$1_OBJS
)
|
"
$
$(XARGS)
"
$
$(XARGS_OPTS)
"
$
$(AR)
"
$
$(AR_OPTS)
$
$(EXTRA_AR_ARGS)
$$
@
endif
endef
...
...
rules/build-package-way.mk
View file @
2440b61a
...
...
@@ -63,11 +63,11 @@ else
ifeq
"$$($1_$2_SplitObjs)" "YES"
$$($1_$2_$3_LIB)
:
$$($1_$2_$3_ALL_OBJS)
"
$
$(RM)
"
$
$(RM_OPTS)
$$
@
(
echo
$$
(
$1_$2_$3_NON_HS_OBJS
)
`
$$
(
$1_$2_$3_MKSTUBOBJS
)
`
;
$
$(FIND)
$
$(
patsubst
%.
$$
(
$3_osuf
)
,%_
$$
(
$3_osuf
)
_split,
$$
(
$1_$2_$3_HS_OBJS
))
-name
'*.$$($3_osuf)'
-print
)
|
$
$(XARGS)
"
$
$(AR)
"
$(AR_OPTS)
$
$(EXTRA_AR_ARGS)
$$
@
(
echo
$$
(
$1_$2_$3_NON_HS_OBJS
)
`
$$
(
$1_$2_$3_MKSTUBOBJS
)
`
;
$
$(FIND)
$
$(
patsubst
%.
$$
(
$3_osuf
)
,%_
$$
(
$3_osuf
)
_split,
$$
(
$1_$2_$3_HS_OBJS
))
-name
'*.$$($3_osuf)'
-print
)
|
"
$
$(XARGS)
"
$
$(XARGS_OPTS)
"
$
$(AR)
"
$
$(AR_OPTS)
$
$(EXTRA_AR_ARGS)
$$
@
else
$$($1_$2_$3_LIB)
:
$$($1_$2_$3_ALL_OBJS)
"
$
$(RM)
"
$
$(RM_OPTS)
$$
@
echo
$$
(
$1_$2_$3_ALL_OBJS
)
`
$$
(
$1_$2_$3_MKSTUBOBJS
)
`
|
$
$(XARGS)
"
$
$(AR)
"
$(AR_OPTS)
$
$(EXTRA_AR_ARGS)
$$
@
echo
$$
(
$1_$2_$3_ALL_OBJS
)
`
$$
(
$1_$2_$3_MKSTUBOBJS
)
`
|
"
$
$(XARGS)
"
$
$(XARGS_OPTS)
"
$
$(AR)
"
$
$(AR_OPTS)
$
$(EXTRA_AR_ARGS)
$$
@
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