diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-11-07 22:37:15 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-11-07 22:37:15 +0000 |
| commit | 2440b61a15e56f0cdee349c2574cdfc40adc6053 (patch) | |
| tree | 77adebe86eeacfb4ee2788cef4b1aa05397bad5a | |
| parent | 758c25ecbfa983546745ceadc9cdca702b83c08f (diff) | |
| download | haskell-2440b61a15e56f0cdee349c2574cdfc40adc6053.tar.gz | |
Split XARGS into XARGS and XARGS_OPTS
| -rw-r--r-- | mk/config.mk.in | 5 | ||||
| -rw-r--r-- | rts/ghc.mk | 2 | ||||
| -rw-r--r-- | rules/build-package-way.mk | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index 6f255a4bcc..ee53a5a7b1 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -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 # diff --git a/rts/ghc.mk b/rts/ghc.mk index b002bdc2a6..a667ac3553 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -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 diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index e674b7aaee..901d66fe29 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -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 |