Permalink
Browse files

Define "ar command" correctly in settings file on Windows

We want to use the inplace ar, rather than whichever ar the
machine that we build on happens to have.
  • Loading branch information...
1 parent 08894f9 commit 2719cacde99fd3127a3569feebdf7183030e000d @igfoo igfoo committed Jan 14, 2012
Showing with 7 additions and 5 deletions.
  1. +3 −0 aclocal.m4
  2. +1 −2 configure.ac
  3. +2 −2 distrib/configure.ac.in
  4. +1 −1 settings.in
View
@@ -359,13 +359,15 @@ AC_DEFUN([FP_SETTINGS],
then
SettingsCCompilerCommand='$topdir/../mingw/bin/gcc.exe'
SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2 $CONF_GCC_LINKER_OPTS_STAGE2"
+ SettingsArCommand='$topdir/../mingw/bin/ar.exe'
SettingsPerlCommand='$topdir/../perl/perl.exe'
SettingsDllWrapCommand='$topdir/../mingw/bin/dllwrap.exe'
SettingsWindresCommand='$topdir/../mingw/bin/windres.exe'
SettingsTouchCommand='$topdir/touchy.exe'
else
SettingsCCompilerCommand="$WhatGccIsCalled"
SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2 $CONF_GCC_LINKER_OPTS_STAGE2"
+ SettingsArCommand="$ArCmd"
SettingsPerlCommand="$PerlCmd"
SettingsDllWrapCommand="/bin/false"
SettingsWindresCommand="/bin/false"
@@ -385,6 +387,7 @@ AC_DEFUN([FP_SETTINGS],
fi
AC_SUBST(SettingsCCompilerCommand)
AC_SUBST(SettingsCCompilerFlags)
+ AC_SUBST(SettingsArCommand)
AC_SUBST(SettingsPerlCommand)
AC_SUBST(SettingsDllWrapCommand)
AC_SUBST(SettingsWindresCommand)
View
@@ -466,8 +466,6 @@ dnl May need to use gcc to find platform details.
dnl --------------------------------------------------------------
FPTOOLS_SET_HASKELL_PLATFORM_VARS
-FP_SETTINGS
-
dnl ** figure out how to do context diffs
FP_PROG_CONTEXT_DIFF
@@ -487,6 +485,7 @@ FP_PROG_AR_NEEDS_RANLIB
dnl ** Check to see whether ln -s works
AC_PROG_LN_S
+FP_SETTINGS
dnl ** Find the path to sed
AC_PATH_PROGS(SedCmd,gsed sed,sed)
View
@@ -88,8 +88,6 @@ dnl May need to use gcc to find platform details.
dnl --------------------------------------------------------------
FPTOOLS_SET_HASKELL_PLATFORM_VARS
-FP_SETTINGS
-
dnl WordSize for settings.in
AC_CHECK_SIZEOF(void *, 4)
WordSize=$ac_cv_sizeof_void_p
@@ -100,6 +98,8 @@ dnl ** how to invoke `ar' and `ranlib'
#
FP_PROG_AR_NEEDS_RANLIB
+FP_SETTINGS
+
#
AC_CONFIG_FILES(settings mk/config.mk mk/install.mk)
AC_OUTPUT
View
@@ -1,7 +1,7 @@
[("GCC extra via C opts", "@GccExtraViaCOpts@"),
("C compiler command", "@SettingsCCompilerCommand@"),
("C compiler flags", "@SettingsCCompilerFlags@"),
- ("ar command", "@ArCmd@"),
+ ("ar command", "@SettingsArCommand@"),
("ar flags", "@ArArgs@"),
("ar supports at file", "@ArSupportsAtFile@"),
("touch command", "@SettingsTouchCommand@"),

0 comments on commit 2719cac

Please sign in to comment.