aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/requirements/java_requirement.rb
diff options
context:
space:
mode:
authorBob W. Hogg2017-02-15 21:47:08 -0800
committerBob W. Hogg2017-02-15 21:47:08 -0800
commitc49b97dd9c4d65a68494a467d542a42528ea9b38 (patch)
treeb9e3cd28083f272953a7f037a5fd9d7f941f9d64 /Library/Homebrew/requirements/java_requirement.rb
parent5a214de68d52eef0bbf99f740dc22c721dd02233 (diff)
downloadbrew-c49b97dd9c4d65a68494a467d542a42528ea9b38.tar.bz2
Code review cleanups
Diffstat (limited to 'Library/Homebrew/requirements/java_requirement.rb')
-rw-r--r--Library/Homebrew/requirements/java_requirement.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/Library/Homebrew/requirements/java_requirement.rb b/Library/Homebrew/requirements/java_requirement.rb
index fa9b6439e..010b7dbc9 100644
--- a/Library/Homebrew/requirements/java_requirement.rb
+++ b/Library/Homebrew/requirements/java_requirement.rb
@@ -83,15 +83,19 @@ class JavaRequirement < Requirement
end
def env_java_common
+ return unless @java_home
java_home = Pathname.new(@java_home)
ENV["JAVA_HOME"] = java_home
ENV.prepend_path "PATH", java_home/"bin"
end
def env_oracle_jdk
+ return unless @java_home
java_home = Pathname.new(@java_home)
+ return unless (java_home/"include").exist?
ENV.append_to_cflags "-I#{java_home}/include"
ENV.append_to_cflags "-I#{java_home}/include/#{oracle_java_os}"
+ true
end
def oracle_java_os