From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Sat, 1 Nov 2014 16:31:42 +0000 (+0100)
Subject: Use new _make_opts rpm macro for -Otarget.
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=a06220f8c6176022227fa59c7fa1b7f228433fc6;p=projects%2Fpld-builder.new.git

Use new _make_opts rpm macro for -Otarget.
---

diff --git a/PLD_Builder/rpm_builder.py b/PLD_Builder/rpm_builder.py
index 904bb0e..3c94a0b 100644
--- a/PLD_Builder/rpm_builder.py
+++ b/PLD_Builder/rpm_builder.py
@@ -227,7 +227,7 @@ def build_rpm(r, b):
                 if r.max_jobs > 0:
                     max_jobs = max(min(config.max_jobs, r.max_jobs), 1)
                 cmd = "set -ex; : build-id: %(r_id)s; TMPDIR=%(tmpdir)s exec nice -n %(nice)s " \
-                    "rpmbuild -bb --define '_smp_mflags -j%(max_jobs)d' --define '__make /usr/bin/make -Otarget %%{?_smp_mflags}' --define '_pld_builder 1' %(rpmdefs)s %(topdir)s/%(spec)s" % {
+                    "rpmbuild -bb --define '_smp_mflags -j%(max_jobs)d' --define '_make_opts -Otarget' --define '_pld_builder 1' %(rpmdefs)s %(topdir)s/%(spec)s" % {
                     'r_id' : r.id,
                     'tmpdir': tmpdir,
                     'nice' : config.nice,