Simplify conditions for superenv activation

`MacOS::Xcode.without_clt? && MacOS.sdk_path.nil?` should never be true.

In its earliest form, this would raise a bare RuntimeError in an effort
to have the bug reported. Later, it was changed to silently disable
superenv. But we don't want to do that. If there's a bug, or the user's
system is misconfigured, we want to know, so that we can fix the bug, or
the user can fix their system. So let's remove the condition.
This commit is contained in:
Jack Nagel 2014-04-22 15:35:54 -05:00
parent ebd77ae8c4
commit 722a5af4eb

View File

@ -4,10 +4,7 @@ require 'extend/ENV/std'
require 'extend/ENV/super' require 'extend/ENV/super'
def superenv? def superenv?
return false if MacOS::Xcode.without_clt? && MacOS.sdk_path.nil? Superenv.bin && Superenv.bin.directory? && ARGV.env != "std"
return false unless Superenv.bin && Superenv.bin.directory?
return false if ARGV.env == "std"
true
end end
module EnvActivation module EnvActivation