diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-24 13:51:25 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-24 13:51:25 +0000 |
| commit | 6e661da4189d47e2a2e1e5d4c8378f35a74ccccb (patch) | |
| tree | 77947a2da2f8d1d992d52ded659a38b790bec3c1 /configure.in | |
| parent | a6820c1de53ba823b722bed6ce79a9ac1d7c71c6 (diff) | |
| download | ruby-6e661da4189d47e2a2e1e5d4c8378f35a74ccccb.tar.gz | |
* configure.in: fixed build failure of Haiku.
[fix GH-984] Patch by @kallisti5
* ext/socket/getaddrinfo.c: ditto.
* ext/socket/getnameinfo.c: ditto.
* ext/socket/rubysocket.h: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52270 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/configure.in b/configure.in index 20586d7ac1..786b538b89 100644 --- a/configure.in +++ b/configure.in @@ -3055,7 +3055,7 @@ if test "$with_dln_a_out" != yes; then [bsdi3*], [ AS_CASE(["$CC"], [*shlicc*], [ : ${LDSHARED='$(CC) -r'} rb_cv_dlopen=yes])], - [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [ + [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu | haiku*], [ : ${LDSHARED='$(CC) -shared'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -Wl,-export-dynamic" @@ -3109,17 +3109,6 @@ if test "$with_dln_a_out" != yes; then ]) : ${LIBPATHENV=LIBRARY_PATH} rb_cv_dlopen=yes], - [haiku*], [ AS_CASE(["$target_cpu"], - [powerpc*], [ - : ${LDSHARED='$(LD) -xms'} - EXTDLDFLAGS='-export $(TARGET_ENTRY)' - DLDFLAGS="$DLDFLAGS -lroot glue-noinit.a init_term_dyn.o start_dyn.o" - ], - [i586*], [ - : ${LDSHARED='$(CC) -shared'} - ]) - : ${LIBPATHENV=LIBRARY_PATH} - rb_cv_dlopen=yes ], [nto-qnx*], [ DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib" : ${LDSHARED='$(LD) -Bshareable -x'} LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib" |