Skip to content
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

Remove 64-bit macOS check and everything based on it #1512

Merged
merged 4 commits into from
Apr 24, 2024
Merged

Remove 64-bit macOS check and everything based on it #1512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8745a2
Remove Java 64-bit macOS statement from README
ryandesign Apr 24, 2024
7aa12d0
Remove commented-out check for libstdc++
ryandesign Apr 24, 2024
a9d8bce
Remove attempt to force x86_64 Java build on macOS
ryandesign Apr 24, 2024
4201e58
Remove faulty check for 64-bit macOS
ryandesign Apr 24, 2024
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
3 changes: 0 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,9 +596,6 @@ configure with:
./configure --disable-java-bindings
```

By default, java requires a 64-bit binary, and not all macOS systems
have a 64-bit devel environment installed.

If you do want Java bindings, be sure to set the JDK_HOME environment
variable to wherever `<Headers/jni.h>` is. Set the JAVA_HOME variable
to the location of the java compiler. Make sure you have ant
Expand Down
25 changes: 0 additions & 25 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,18 +174,6 @@ esac
AC_MSG_RESULT([$cygwin])
AM_CONDITIONAL(OS_CYGWIN, test "x$cygwin" = "xyes")

AC_MSG_CHECKING([for 64-bit Apple OSX])
case "$host_os" in
x86_64-*darwin*)
apple_osx=yes
;;
*)
apple_osx=no
;;
esac
AC_MSG_RESULT([$apple_osx])
AM_CONDITIONAL(OS_X, test "x$apple_osx" = "xyes")

AC_MSG_CHECKING([for NetBSD])
case "$host_os" in
*netbsd*)
Expand Down Expand Up @@ -385,11 +373,6 @@ AC_ARG_ENABLE( sat-solver,
fi], [enable_sat_solver=no])

AS_IF([test "x$enable_sat_solver" = xyes], [
# The sat-solver code is in C++; so the link-grammar library should now
# directly require libstdc++ instead of indirectly depend on its
# availability via the minisat2 library.
#test x${apple_osx} = xyes || AC_CHECK_LIB(stdc++, main)

# We want to check for C++; the easiest way to do this is to
# use c++ to compile stdio.h and bomb if it fails.
AC_LANG([C++])
Expand Down Expand Up @@ -781,14 +764,6 @@ AC_SUBST(REGEX_CFLAGS)
JNIfound=no

if test "x$enable_java_bindings" = "xyes"; then

if test x${apple_osx} = xyes; then
# Java on Apple OSX requires a 64-bit build. However, even
# modern 64-bit Apple machines build 32-bit binaries by default.
# So force a 64-bit build if a 64-bit CPU is found.
CFLAGS="-arch x86_64 ${CFLAGS}"
fi

absolute_srcdir=`(cd "$srcdir"; pwd)`
JAVA_SRCDIR=$absolute_srcdir/bindings/java
if test "$native_win32" = yes; then
Expand Down