diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.in | 9 |
2 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,12 @@ +Tue Aug 28 20:03:54 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * configure.in: Fixing Haiku R1/alpha3 build with gcc-4.4.4. + - omit ANSI standard flags to compile socket extension where + anonymous union is required. + - remove redundant -be flags. + by Takashi Toyoshima <toyoshim@gmail.com> + https://github.com/ruby/ruby/pull/168 + Tue Aug 28 11:32:37 2012 Yuki Yugui Sonoda <yugui@google.com> * nacl/GNUmakefile.in (.rbconfig.time): r36828 was incomplete. diff --git a/configure.in b/configure.in index ec144d2a4c..9a01b70521 100644 --- a/configure.in +++ b/configure.in @@ -622,6 +622,11 @@ if test "$GCC" = yes; then [cygwin*|darwin*|netbsd*], [ # need lgamma_r(), finite() ], + [haiku], [ + # Haiku R1/alpha3 uses gcc-4.4.4 which can not handle anonymous union + # with ANSI standard flags. Anonumous union is required to compile + # socket extension where <net/if.h> uses anonymous union. + ], [ # ANSI (no XCFLAGS because this is C only) RUBY_TRY_CFLAGS(-ansi -std=iso9899:199409, [ @@ -2294,11 +2299,11 @@ if test "$with_dln_a_out" != yes; then [powerpc*], [ : ${LDSHARED='$(LD) -xms'} EXTDLDFLAGS='-export $(TARGET_ENTRY)' - DLDFLAGS="$DLDFLAGS -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o" + DLDFLAGS="$DLDFLAGS -lroot glue-noinit.a init_term_dyn.o start_dyn.o" ], [i586*], [ : ${LDSHARED='$(LD) -shared'} - DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot" + DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lroot" ]) : ${LIBPATHENV=LIBRARY_PATH} rb_cv_dlopen=yes ], |