diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-05-30 23:31:33 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-05-30 23:31:33 +0000 |
| commit | da22bc8bb5b33eaeba2f06152904a3a2a689b6c1 (patch) | |
| tree | b55c62831c6e086abe012515a546788955603b93 | |
| parent | 0ef6ba7b28187a4bf5309f9702eeaf53a281204b (diff) | |
| download | haskell-da22bc8bb5b33eaeba2f06152904a3a2a689b6c1.tar.gz | |
$(XARGS) might include arguments, so don't quote it in makefiles
| -rw-r--r-- | rts/ghc.mk | 2 | ||||
| -rw-r--r-- | rules/build-package-way.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/rts/ghc.mk b/rts/ghc.mk index 9629aba5bb..a9ccec133a 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -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 diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index 074ea404a8..d2b8499086 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -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 |