Commit 2719cacd authored by Ian Lynagh's avatar Ian Lynagh
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.
parent 08894f96
...@@ -359,6 +359,7 @@ AC_DEFUN([FP_SETTINGS], ...@@ -359,6 +359,7 @@ AC_DEFUN([FP_SETTINGS],
then then
SettingsCCompilerCommand='$topdir/../mingw/bin/gcc.exe' SettingsCCompilerCommand='$topdir/../mingw/bin/gcc.exe'
SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2 $CONF_GCC_LINKER_OPTS_STAGE2" SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2 $CONF_GCC_LINKER_OPTS_STAGE2"
SettingsArCommand='$topdir/../mingw/bin/ar.exe'
SettingsPerlCommand='$topdir/../perl/perl.exe' SettingsPerlCommand='$topdir/../perl/perl.exe'
SettingsDllWrapCommand='$topdir/../mingw/bin/dllwrap.exe' SettingsDllWrapCommand='$topdir/../mingw/bin/dllwrap.exe'
SettingsWindresCommand='$topdir/../mingw/bin/windres.exe' SettingsWindresCommand='$topdir/../mingw/bin/windres.exe'
...@@ -366,6 +367,7 @@ AC_DEFUN([FP_SETTINGS], ...@@ -366,6 +367,7 @@ AC_DEFUN([FP_SETTINGS],
else else
SettingsCCompilerCommand="$WhatGccIsCalled" SettingsCCompilerCommand="$WhatGccIsCalled"
SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2 $CONF_GCC_LINKER_OPTS_STAGE2" SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2 $CONF_GCC_LINKER_OPTS_STAGE2"
SettingsArCommand="$ArCmd"
SettingsPerlCommand="$PerlCmd" SettingsPerlCommand="$PerlCmd"
SettingsDllWrapCommand="/bin/false" SettingsDllWrapCommand="/bin/false"
SettingsWindresCommand="/bin/false" SettingsWindresCommand="/bin/false"
...@@ -385,6 +387,7 @@ AC_DEFUN([FP_SETTINGS], ...@@ -385,6 +387,7 @@ AC_DEFUN([FP_SETTINGS],
fi fi
AC_SUBST(SettingsCCompilerCommand) AC_SUBST(SettingsCCompilerCommand)
AC_SUBST(SettingsCCompilerFlags) AC_SUBST(SettingsCCompilerFlags)
AC_SUBST(SettingsArCommand)
AC_SUBST(SettingsPerlCommand) AC_SUBST(SettingsPerlCommand)
AC_SUBST(SettingsDllWrapCommand) AC_SUBST(SettingsDllWrapCommand)
AC_SUBST(SettingsWindresCommand) AC_SUBST(SettingsWindresCommand)
......
...@@ -466,8 +466,6 @@ dnl May need to use gcc to find platform details. ...@@ -466,8 +466,6 @@ dnl May need to use gcc to find platform details.
dnl -------------------------------------------------------------- dnl --------------------------------------------------------------
FPTOOLS_SET_HASKELL_PLATFORM_VARS FPTOOLS_SET_HASKELL_PLATFORM_VARS
FP_SETTINGS
dnl ** figure out how to do context diffs dnl ** figure out how to do context diffs
FP_PROG_CONTEXT_DIFF FP_PROG_CONTEXT_DIFF
...@@ -487,6 +485,7 @@ FP_PROG_AR_NEEDS_RANLIB ...@@ -487,6 +485,7 @@ FP_PROG_AR_NEEDS_RANLIB
dnl ** Check to see whether ln -s works dnl ** Check to see whether ln -s works
AC_PROG_LN_S AC_PROG_LN_S
FP_SETTINGS
dnl ** Find the path to sed dnl ** Find the path to sed
AC_PATH_PROGS(SedCmd,gsed sed,sed) AC_PATH_PROGS(SedCmd,gsed sed,sed)
......
...@@ -88,8 +88,6 @@ dnl May need to use gcc to find platform details. ...@@ -88,8 +88,6 @@ dnl May need to use gcc to find platform details.
dnl -------------------------------------------------------------- dnl --------------------------------------------------------------
FPTOOLS_SET_HASKELL_PLATFORM_VARS FPTOOLS_SET_HASKELL_PLATFORM_VARS
FP_SETTINGS
dnl WordSize for settings.in dnl WordSize for settings.in
AC_CHECK_SIZEOF(void *, 4) AC_CHECK_SIZEOF(void *, 4)
WordSize=$ac_cv_sizeof_void_p WordSize=$ac_cv_sizeof_void_p
...@@ -100,6 +98,8 @@ dnl ** how to invoke `ar' and `ranlib' ...@@ -100,6 +98,8 @@ dnl ** how to invoke `ar' and `ranlib'
# #
FP_PROG_AR_NEEDS_RANLIB FP_PROG_AR_NEEDS_RANLIB
FP_SETTINGS
# #
AC_CONFIG_FILES(settings mk/config.mk mk/install.mk) AC_CONFIG_FILES(settings mk/config.mk mk/install.mk)
AC_OUTPUT AC_OUTPUT
......
[("GCC extra via C opts", "@GccExtraViaCOpts@"), [("GCC extra via C opts", "@GccExtraViaCOpts@"),
("C compiler command", "@SettingsCCompilerCommand@"), ("C compiler command", "@SettingsCCompilerCommand@"),
("C compiler flags", "@SettingsCCompilerFlags@"), ("C compiler flags", "@SettingsCCompilerFlags@"),
("ar command", "@ArCmd@"), ("ar command", "@SettingsArCommand@"),
("ar flags", "@ArArgs@"), ("ar flags", "@ArArgs@"),
("ar supports at file", "@ArSupportsAtFile@"), ("ar supports at file", "@ArSupportsAtFile@"),
("touch command", "@SettingsTouchCommand@"), ("touch command", "@SettingsTouchCommand@"),
......
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