diff options
Diffstat (limited to 'lib/configure.sh')
-rwxr-xr-x | lib/configure.sh | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/lib/configure.sh b/lib/configure.sh index a693153b..e60001fb 100755 --- a/lib/configure.sh +++ b/lib/configure.sh @@ -41,17 +41,6 @@ configure_build() local stamp="`get_stamp_name configure ${gitinfo} ${2:+$2}`" local builddir="`get_builddir ${gitinfo} ${2:+$2}`" - # Since Binutils and GDB have a shared git repository, this confuses the logic - # of loading the right config file. If Binutils is already configured, then - # assume GDB. - if test "`echo $1 | grep -c binutils`" -gt 0; then - if test -e ${local_builds}/${binutils_version}-configure-stamp; then - local tool="gdb" - else - local tool="binutils" - fi - fi - # Don't look for the stamp in the builddir because it's in builddir's # parent directory. local stampdir="`dirname ${builddir}`" @@ -76,6 +65,14 @@ configure_build() # fi fi + # Since Binutils and GDB have a shared git repository, this confuses the logic + # of loading the right config file. If Binutils is already configured, then + # assume GDB. + echo "FOO" + if test x"${2}" = x"gdb" -o x"${2}" = x"binutils"; then + local tool="${2}" + fi + local configure="`grep ^configure= ${topdir}/config/${tool}.conf | cut -d '\"' -f 2`" if test x"${configure}" = x; then configure="yes" |