diff options
author | Jing Yu <jingyu@google.com> | 2010-01-18 13:38:25 -0800 |
---|---|---|
committer | Jing Yu <jingyu@google.com> | 2010-01-18 13:38:25 -0800 |
commit | 30f553f6a7597e8084704b84876dea2af493d6fe (patch) | |
tree | 569579768afd83d884f5f1118272fea213afdb36 /gcc-4.4.0/libjava/configure.ac | |
parent | 727407e24af9df776e77f6a5762a62869198bc09 (diff) | |
download | toolchain_gcc-30f553f6a7597e8084704b84876dea2af493d6fe.tar.gz toolchain_gcc-30f553f6a7597e8084704b84876dea2af493d6fe.tar.bz2 toolchain_gcc-30f553f6a7597e8084704b84876dea2af493d6fe.zip |
Bring gcc-4.4.0 to up-to-date.
Diffstat (limited to 'gcc-4.4.0/libjava/configure.ac')
-rw-r--r-- | gcc-4.4.0/libjava/configure.ac | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/gcc-4.4.0/libjava/configure.ac b/gcc-4.4.0/libjava/configure.ac index ae538fa86..bddb79dcb 100644 --- a/gcc-4.4.0/libjava/configure.ac +++ b/gcc-4.4.0/libjava/configure.ac @@ -409,23 +409,33 @@ else which_gcj=path fi fi +libgcjdir=`${PWDCMD-pwd}` +case $GCJ in +*" -B"*) + # Just in case there is a comma in the build dir, quote it for the + # sed command below. + case $libgcjdir in + *[[,\\]]*) qlibgcjdir=`echo "$libgcjdir" | sed 's:[[,\\]]:\\&:g'`;; + *) qlibgcjdir=$libgcjdir;; + esac + GCJ=`echo "$GCJ" | sed "s, -B, -B$qlibgcjdir/&,"` + ;; +*) + GCJ=$GCJ" -B$libgcjdir/" + ;; +esac case "${which_gcj}" in built) - GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/" GCJH='$(top_builddir)/$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh' ;; cross) if test "x${with_newlib}" = "xyes"; then # FIXME (comment): Why is this needed? GCC_UNWIND_INCLUDE= - GCJ="${target_noncanonical}-gcj" - else - GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/" fi GCJH='$(target_noncanonical)-gcjh' ;; path) - GCJ="gcj -B`${PWDCMD-pwd}`/" GCJH=gcjh ;; esac |