Commit 70b4e94b authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Add stage-specific versions of more ar-related makefile vars

parent 4c452d12
...@@ -603,6 +603,18 @@ AR_STAGE0 = $(AR) ...@@ -603,6 +603,18 @@ AR_STAGE0 = $(AR)
AR_STAGE1 = $(AR) AR_STAGE1 = $(AR)
AR_STAGE2 = $(AR) AR_STAGE2 = $(AR)
AR_STAGE3 = $(AR) AR_STAGE3 = $(AR)
AR_OPTS_STAGE0 = $(AR_OPTS)
AR_OPTS_STAGE1 = $(AR_OPTS)
AR_OPTS_STAGE2 = $(AR_OPTS)
AR_OPTS_STAGE3 = $(AR_OPTS)
EXTRA_AR_ARGS_STAGE0 = $(EXTRA_AR_ARGS)
EXTRA_AR_ARGS_STAGE1 = $(EXTRA_AR_ARGS)
EXTRA_AR_ARGS_STAGE2 = $(EXTRA_AR_ARGS)
EXTRA_AR_ARGS_STAGE3 = $(EXTRA_AR_ARGS)
ArSupportsAtFile_STAGE0 = $(ArSupportsAtFile)
ArSupportsAtFile_STAGE1 = $(ArSupportsAtFile)
ArSupportsAtFile_STAGE2 = $(ArSupportsAtFile)
ArSupportsAtFile_STAGE3 = $(ArSupportsAtFile)
CONTEXT_DIFF = @ContextDiffCmd@ CONTEXT_DIFF = @ContextDiffCmd@
CP = cp CP = cp
......
...@@ -195,7 +195,7 @@ else ...@@ -195,7 +195,7 @@ else
$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) $$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS)
"$$(RM)" $$(RM_OPTS) $$@ "$$(RM)" $$(RM_OPTS) $$@
echo $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR_STAGE1)" \ echo $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR_STAGE1)" \
$$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@ $$(AR_OPTS_STAGE1) $$(EXTRA_AR_ARGS_STAGE1) $$@
endif endif
endif endif
...@@ -499,7 +499,7 @@ endif ...@@ -499,7 +499,7 @@ endif
ifneq "$(BINDIST)" "YES" ifneq "$(BINDIST)" "YES"
rts/dist/build/libHSrtsmain.a : rts/dist/build/Main.o rts/dist/build/libHSrtsmain.a : rts/dist/build/Main.o
"$(RM)" $(RM_OPTS) $@ "$(RM)" $(RM_OPTS) $@
"$(AR_STAGE1)" $(AR_OPTS) $(EXTRA_AR_ARGS) $@ $< "$(AR_STAGE1)" $(AR_OPTS_STAGE1) $(EXTRA_AR_ARGS_STAGE1) $@ $<
endif endif
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
......
...@@ -87,10 +87,10 @@ ifeq "$$($1_$2_SplitObjs)" "YES" ...@@ -87,10 +87,10 @@ ifeq "$$($1_$2_SplitObjs)" "YES"
else else
echo $$($1_$2_$3_ALL_OBJS) >> $$@.contents echo $$($1_$2_$3_ALL_OBJS) >> $$@.contents
endif endif
ifeq "$$(ArSupportsAtFile)" "YES" ifeq "$$($1_$2_ArSupportsAtFile)" "YES"
"$$($1_$2_AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@ @$$@.contents "$$($1_$2_AR)" $$($1_$2_AR_OPTS) $$($1_$2_EXTRA_AR_ARGS) $$@ @$$@.contents
else else
"$$(XARGS)" $$(XARGS_OPTS) "$$($1_$2_AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@ < $$@.contents "$$(XARGS)" $$(XARGS_OPTS) "$$($1_$2_AR)" $$($1_$2_AR_OPTS) $$($1_$2_EXTRA_AR_ARGS) $$@ < $$@.contents
endif endif
"$$(RM)" $$(RM_OPTS) $$@.contents "$$(RM)" $$(RM_OPTS) $$@.contents
endif endif
......
...@@ -18,6 +18,9 @@ $(call profStart, package-config($1,$2,$3)) ...@@ -18,6 +18,9 @@ $(call profStart, package-config($1,$2,$3))
$1_$2_HC = $$(GHC_STAGE$3) $1_$2_HC = $$(GHC_STAGE$3)
$1_$2_CC = $$(CC_STAGE$3) $1_$2_CC = $$(CC_STAGE$3)
$1_$2_AR = $$(AR_STAGE$3) $1_$2_AR = $$(AR_STAGE$3)
$1_$2_AR_OPTS = $$(AR_OPTS_STAGE$3)
$1_$2_EXTRA_AR_ARGS = $$(EXTRA_AR_ARGS_STAGE$3)
$1_$2_ArSupportsAtFile = $$(ArSupportsAtFile_STAGE$3)
# configuration stuff that depends on which GHC we're building with # configuration stuff that depends on which GHC we're building with
ifeq "$3" "0" ifeq "$3" "0"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment