Skip to content

Commit

Permalink
Merge pull request #716 from alanthing/issue707
Browse files Browse the repository at this point in the history
Fixes #707
  • Loading branch information
jordansissel committed Jun 13, 2014
2 parents 58cfb42 + d299d9d commit ebcaf8a
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion lib/fpm/package/rpm.rb
Expand Up @@ -309,12 +309,16 @@ def output(output_path)
args = ["rpmbuild", "-bb"]

if %x{uname -m}.chomp != self.architecture
args += [ '--target', self.architecture ]
rpm_target = self.architecture
end

# issue #309
if !attributes[:rpm_os].nil?
rpm_target = "#{architecture}-unknown-#{attributes[:rpm_os]}"
end

# issue #707
if !rpm_target.nil?
args += ["--target", rpm_target]
end

Expand Down

0 comments on commit ebcaf8a

Please sign in to comment.