Skip to content

Fixing Haiku build. #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
toyoshim wants to merge 1 commit into from
Closed

Fixing Haiku build. #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions configure.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ if test "$GCC" = yes; then

# -fstack-protector
AS_CASE(["$target_os"],
[mingw*|nacl], [
[mingw*|nacl|haiku], [
stack_protector=no
],
[
Expand Down Expand Up @@ -2304,8 +2304,8 @@ if test "$with_dln_a_out" != yes; then
],
[i586*], [
: ${LDSHARED='$(LD) -shared'}
DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib \$(topdir)/_APP_ -lbe -lroot"
LDFLAGS="$LDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib -lbe -lroot"
DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib \$(topdir)/_APP_ -lroot"
LDFLAGS="$LDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib -lroot"
])
: ${LIBPATHENV=LIBRARY_PATH}
rb_cv_dlopen=yes],
Expand Down
6 changes: 5 additions & 1 deletion signal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,12 @@ ruby_signal(int signum, sighandler_t handler)
sigact.sa_flags |= SA_NOCLDWAIT;
#endif
#if defined(SA_ONSTACK) && defined(USE_SIGALTSTACK)
if (signum == SIGSEGV || signum == SIGBUS)
if (signum == SIGSEGV)
sigact.sa_flags |= SA_ONSTACK;
#ifdef SIGBUS
if (signum == SIGBUS)
sigact.sa_flags |= SA_ONSTACK;
#endif
#endif
if (sigaction(signum, &sigact, &old) < 0) {
if (errno != 0 && errno != EINVAL) {
Expand Down