From: Ian Lynagh <igloo@earth.li>
Date: Fri, 29 Apr 2011 13:56:31 +0000 (+0100)
Subject: Add ar location and details to settings file
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=a8ea6721b0477d76ec00e5daa698a5cf9cb89600;p=ghc-hetmet.git

Add ar location and details to settings file
---

diff --git a/configure.ac b/configure.ac
index 96950cb..d2deeb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,6 +134,9 @@ if test "$WithGhc" != ""; then
   AC_SUBST(ghc_ge_613)dnl
 
   BOOTSTRAPPING_GHC_INFO_FIELD([CC_STAGE0],[C compiler command],['$(CC)'])
+  BOOTSTRAPPING_GHC_INFO_FIELD([AR_STAGE0],[ar command],['$(AR)'])
+  BOOTSTRAPPING_GHC_INFO_FIELD([AR_OPTS_STAGE0],[ar flags],['$(AR_OPTS)'])
+  BOOTSTRAPPING_GHC_INFO_FIELD([ArSupportsAtFile_STAGE0],[ar supports at file],['$(ArSupportsAtFile)'])
 fi
 
 dnl ** Must have GHC to build GHC, unless --enable-hc-boot is on
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 3d2d6c0..8796ad4 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -604,11 +604,11 @@ AR			= @ArCmd@
 AR_OPTS			= @ArArgs@
 ArSupportsAtFile = @ArSupportsAtFile@
 
-AR_STAGE0 = $(AR)
+AR_STAGE0 = @AR_STAGE0@
 AR_STAGE1 = $(AR)
 AR_STAGE2 = $(AR)
 AR_STAGE3 = $(AR)
-AR_OPTS_STAGE0 = $(AR_OPTS)
+AR_OPTS_STAGE0 = @AR_OPTS_STAGE0@
 AR_OPTS_STAGE1 = $(AR_OPTS)
 AR_OPTS_STAGE2 = $(AR_OPTS)
 AR_OPTS_STAGE3 = $(AR_OPTS)
@@ -616,7 +616,7 @@ 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_STAGE0 = @ArSupportsAtFile_STAGE0@
 ArSupportsAtFile_STAGE1 = $(ArSupportsAtFile)
 ArSupportsAtFile_STAGE2 = $(ArSupportsAtFile)
 ArSupportsAtFile_STAGE3 = $(ArSupportsAtFile)
diff --git a/settings.in b/settings.in
index 0d992a2..5d4e1d3 100644
--- a/settings.in
+++ b/settings.in
@@ -1,5 +1,8 @@
 [("GCC extra via C opts", "@GccExtraViaCOpts@"),
  ("C compiler command", "@WhatGccIsCalled@"),
  ("C compiler flags", "@CONF_CC_OPTS_STAGE2@"),
+ ("ar command", "@ArCmd@"),
+ ("ar flags", "@ArArgs@"),
+ ("ar supports at file", "@ArSupportsAtFile@"),
  ("perl command", "@PerlCmd@")]