aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/language
diff options
context:
space:
mode:
authorMarkus Reiter2016-09-23 17:17:49 +0200
committerGitHub2016-09-23 17:17:49 +0200
commit246bb1a3b18cf41c2499cc78b7eac8fab503c5d6 (patch)
tree24c62806b60d59b0f9a689ac693a7afec5bd3291 /Library/Homebrew/language
parent4cbeb1e981e974474a0d37c120ffa18e13ac3db9 (diff)
parentfe2d51e0b9d4d9c138e512c245b1ed8d0f1dbf53 (diff)
downloadbrew-246bb1a3b18cf41c2499cc78b7eac8fab503c5d6.tar.bz2
Merge pull request #1050 from reitermarkus/rubocop
RuboCop changes.
Diffstat (limited to 'Library/Homebrew/language')
-rw-r--r--Library/Homebrew/language/haskell.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/Library/Homebrew/language/haskell.rb b/Library/Homebrew/language/haskell.rb
index b5d0e1220..4b7f88a99 100644
--- a/Library/Homebrew/language/haskell.rb
+++ b/Library/Homebrew/language/haskell.rb
@@ -79,19 +79,16 @@ module Language
# if we have build flags, we have to pass them to cabal install to resolve the necessary
# dependencies, and call cabal configure afterwards to set the flags again for compile
- flags = ""
- if options[:flags]
- flags = "--flags=#{options[:flags].join(" ")}"
- end
+ flags = "--flags=#{options[:flags].join(" ")}" if options[:flags]
args_and_flags = args
- args_and_flags << flags unless flags.empty?
+ args_and_flags << flags unless flags.nil?
# install dependencies in the sandbox
cabal_install "--only-dependencies", *args_and_flags
# call configure if build flags are set
- cabal_configure flags unless flags.empty?
+ cabal_configure flags unless flags.nil?
# install the main package in the destination dir
cabal_install "--prefix=#{prefix}", *args