Make it work with current master.

pull/3590/head
Jussi Pakkanen 6 years ago
parent e60bf5d833
commit 10b094c980
  1. 17
      mesonbuild/minstall.py

@ -384,14 +384,15 @@ class Installer:
def install_targets(self, d):
for t in d.targets:
fname = check_for_stampfile(t[0])
outdir = get_destdir_path(d, t[1])
fname = check_for_stampfile(t.fname)
outdir = get_destdir_path(d, t.outdir)
outname = os.path.join(outdir, os.path.basename(fname))
final_path = os.path.join(d.prefix, outname)
aliases = t[2]
should_strip = t[3]
install_rpath = t[4]
install_mode = t[5]
final_path = os.path.join(d.prefix, t.outdir, os.path.basename(fname))
aliases = t.aliases
should_strip = t.strip
install_rpath = t.install_rpath
install_name_mappings = t.install_name_mappings
install_mode = t.install_mode
d.dirmaker.makedirs(outdir, exist_ok=True)
if not os.path.exists(fname):
raise RuntimeError('File {!r} could not be found'.format(fname))
@ -438,7 +439,7 @@ class Installer:
if os.path.isfile(outname):
try:
depfixer.fix_rpath(outname, install_rpath, final_path,
verbose=False)
install_name_mappings, verbose=False)
except SystemExit as e:
if isinstance(e.code, int) and e.code == 0:
pass

Loading…
Cancel
Save