diff options
| author | Andreas Tobler <a.tobler@schweiz.ch> | 2005-05-06 20:27:45 +0200 |
|---|---|---|
| committer | Andreas Tobler <andreast@gcc.gnu.org> | 2005-05-06 20:27:45 +0200 |
| commit | 1aa7cc9241335727302c5d2a57723bd2879bf491 (patch) | |
| tree | cac382ce73f9a03b267c91360daf02b29c4799a0 | |
| parent | 362fc657eca85684066e300bd2c8330d7f0003ad (diff) | |
re PR target/21325 (libjava should be re-enabled for ppc-darwin)
2005-05-06 Andreas Tobler <a.tobler@schweiz.ch>
PR target/21325
* configure.in (powerpc-*-darwin*): Remove ${libgcj} from noconfigdirs.
* configure: Regenerated.
From-SVN: r99328
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | configure | 39 | ||||
| -rw-r--r-- | configure.in | 2 |
3 files changed, 17 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog index 0aa18971445..1a08b2e3cab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-05-06 Andreas Tobler <a.tobler@schweiz.ch> + + PR target/21325 + * configure.in (powerpc-*-darwin*): Remove ${libgcj} from noconfigdirs. + * configure: Regenerated. + 2005-04-25 Bernd Schmidt <bernd.schmidt@analog.com> * MAINTAINERS: Add self as Blackfin maintainer diff --git a/configure b/configure index 204dcf3f5f3..72e69046257 100755 --- a/configure +++ b/configure @@ -1155,7 +1155,7 @@ case "${target}" in noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" ;; powerpc-*-darwin*) - noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof ${libgcj}" + noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof" ;; *-*-darwin*) noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof" @@ -4983,34 +4983,15 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then we branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\_ACEOF -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -t quote -d -: quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -s,\[,\\&,g -s,\],\\&,g -s,\$,$$,g -p -_ACEOF -# We use echo to avoid assuming a particular line-breaking character. -# The extra dot is to prevent the shell from consuming trailing -# line-breaks from the sub-command output. A line-break within -# single-quotes doesn't work because, if this script is created in a -# platform that uses two characters for line-breaks (e.g., DOS), tr -# would break. -ac_LF_and_DOT=`echo; echo .` -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -rm -f confdef2opt.sed +cat > conftest.defs <<\EOF +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g +s%\[%\\&%g +s%\]%\\&%g +s%\$%$$%g +EOF +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +rm -f conftest.defs # Without the "./", some shells look in PATH for config.status. diff --git a/configure.in b/configure.in index 0d0fd7a551f..76305f68ce7 100644 --- a/configure.in +++ b/configure.in @@ -364,7 +364,7 @@ case "${target}" in noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" ;; powerpc-*-darwin*) - noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof ${libgcj}" + noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof" ;; *-*-darwin*) noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof" |