| ... |
... |
@@ -52,29 +52,13 @@ AC_DEFUN([SUBST_TOOLDIR], |
|
52
|
52
|
# Set the variables used in the settings file
|
|
53
|
53
|
AC_DEFUN([FP_SETTINGS],
|
|
54
|
54
|
[
|
|
55
|
|
- SettingsRanlibCommand="$RanlibCmd"
|
|
56
|
|
-
|
|
57
|
|
- if test -z "$WindresCmd"; then
|
|
58
|
|
- SettingsWindresCommand="/bin/false"
|
|
59
|
|
- else
|
|
60
|
|
- SettingsWindresCommand="$WindresCmd"
|
|
61
|
|
- fi
|
|
62
|
|
-
|
|
63
|
55
|
# LLVM backend tools
|
|
64
|
|
- SettingsLlcCommand="$LlcCmd"
|
|
65
|
|
- SettingsOptCommand="$OptCmd"
|
|
66
|
|
- SettingsLlvmAsCommand="$LlvmAsCmd"
|
|
67
|
|
- SettingsLlvmAsFlags="$LlvmAsFlags"
|
|
68
|
56
|
|
|
69
|
57
|
if test "$EnableDistroToolchain" = "YES"; then
|
|
70
|
58
|
# If the user specified --enable-distro-toolchain then we just use the
|
|
71
|
59
|
# executable names, not paths.
|
|
72
|
60
|
dnl XXX="$(basename XXX)"
|
|
73
|
61
|
SettingsLdCommand="$(basename $SettingsLdCommand)"
|
|
74
|
|
- SettingsWindresCommand="$(basename $SettingsWindresCommand)"
|
|
75
|
|
- SettingsLlcCommand="$(basename $SettingsLlcCommand)"
|
|
76
|
|
- SettingsOptCommand="$(basename $SettingsOptCommand)"
|
|
77
|
|
- SettingsLlvmAsCommand="$(basename $SettingsLlvmAsCommand)"
|
|
78
|
62
|
fi
|
|
79
|
63
|
|
|
80
|
64
|
if test "$windows" = YES -a "$EnableDistroToolchain" = "NO"; then
|
| ... |
... |
@@ -82,22 +66,7 @@ AC_DEFUN([FP_SETTINGS], |
|
82
|
66
|
# We need to issue a substitution to use $tooldir,
|
|
83
|
67
|
# See Note [tooldir: How GHC finds mingw on Windows]
|
|
84
|
68
|
dnl SUBST_TOOLDIR([XXX])
|
|
85
|
|
- SUBST_TOOLDIR([SettingsRanlibCommand])
|
|
86
|
|
- SUBST_TOOLDIR([SettingsWindresCommand])
|
|
87
|
|
- SUBST_TOOLDIR([SettingsLlcCommand])
|
|
88
|
|
- SUBST_TOOLDIR([SettingsOptCommand])
|
|
89
|
|
- SUBST_TOOLDIR([SettingsLlvmAsCommand])
|
|
90
|
|
- SUBST_TOOLDIR([SettingsLlvmAsFlags])
|
|
91
|
69
|
fi
|
|
92
|
70
|
|
|
93
|
|
- SettingsInstallNameToolCommand="$InstallNameToolCmd"
|
|
94
|
|
-
|
|
95
|
71
|
AC_SUBST(EnableDistroToolchain)
|
|
96
|
|
- AC_SUBST(SettingsRanlibCommand)
|
|
97
|
|
- AC_SUBST(SettingsInstallNameToolCommand)
|
|
98
|
|
- AC_SUBST(SettingsWindresCommand)
|
|
99
|
|
- AC_SUBST(SettingsLlcCommand)
|
|
100
|
|
- AC_SUBST(SettingsOptCommand)
|
|
101
|
|
- AC_SUBST(SettingsLlvmAsCommand)
|
|
102
|
|
- AC_SUBST(SettingsLlvmAsFlags)
|
|
103
|
72
|
]) |