billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix use of extra args.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-05-17 18:23:10 +01:00
parent 0c6fdc9b08
commit 7b2f565a11
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ognibuild/buildsystem.py
View file

@ -726,9 +726,11 @@ class R(BuildSystem):
return dc.copy_single(target_directory) return dc.copy_single(target_directory)
def install(self, session, resolver, fixers, install_target): def install(self, session, resolver, fixers, install_target):
extra_args.append("--prefix=%s" % install_target.prefix) extra_args = []
if install_target.prefix:
extra_args.append("--prefix=%s" % install_target.prefix)
r_path = guaranteed_which(session, resolver, "R") r_path = guaranteed_which(session, resolver, "R")
run_with_build_fixers(session, [r_path, "CMD", "INSTALL", "."], fixers) run_with_build_fixers(session, [r_path, "CMD", "INSTALL", "."] + extra_args, fixers)
def test(self, session, resolver, fixers): def test(self, session, resolver, fixers):
r_path = guaranteed_which(session, resolver, "R") r_path = guaranteed_which(session, resolver, "R")