Skip to content

Commit

Permalink
Unset JAVA_TOOL_OPTIONS in compile.sh
Browse files Browse the repository at this point in the history
If this option is set, the java version check fails. Fixing the
java version check to support JAVA_TOOL_OPTIONS is more dangerous
than simply unsetting it. Keeping JAVA_TOOL_OPTIONS would allow
to override java compilation configuration of Bazel.

Fixes bazelbuild#41

--
MOS_MIGRATED_REVID=89500863
  • Loading branch information
damienmg committed Mar 25, 2015
1 parent 916c1de commit f925f07
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ CC=${CC:-gcc}
CPP=${CPP:-g++}
CPPSTD="c++0x"

unset JAVA_TOOL_OPTIONS

JAVA_VERSION=${JAVA_VERSION:-"1.8"}
PLATFORM="$(uname -s | tr 'A-Z' 'a-z')"
ARCHIVE_CFLAGS=${ARCHIVE_CFLAGS:-""}
Expand Down

0 comments on commit f925f07

Please sign in to comment.