Minimize the if openbsd? block

sparklemotion · Dec 7, 2016 · 4f792a2 · larskanis · Dec 29, 2016 · knu
1 parent a3db87e
commit 4f792a2
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/ext/nokogiri/extconf.rb b/ext/nokogiri/extconf.rb
@@ -391,16 +391,12 @@ def using_system_libraries?
   do_clean
 end
 
-if openbsd? && !ENV['CC']
-  unless find_executable 'egcc'
-    message "please install gcc 4.9+ from ports using `pkg_add -v gcc`\n"
-    exit! 1
-  end
-  RbConfig::MAKEFILE_CONFIG['CC'] = find_executable 'egcc'
-elsif ENV['CC']
-  RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC']
+if openbsd?
+  ENV['CC'] ||= find_executable('egcc')
+    abort "Please install gcc 4.9+ from ports using `pkg_add -v gcc`"
 end
 
+RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 # use same c compiler for libxml and libxslt
 ENV['CC'] = RbConfig::MAKEFILE_CONFIG['CC']