depfixer: We no longer run this as a script

pull/3385/merge
Nirbheek Chauhan 7 years ago committed by Nirbheek Chauhan
parent ecbeae565b
commit a6c9f98c57
  1. 4
      mesonbuild/environment.py
  2. 3
      mesonbuild/mesonmain.py
  3. 13
      mesonbuild/scripts/depfixer.py

@ -652,10 +652,6 @@ class Environment:
def get_scratch_dir(self):
return self.scratch_dir
def get_depfixer(self):
path = os.path.dirname(__file__)
return os.path.join(path, 'depfixer.py')
def detect_objc_compiler(self, want_cross):
popen_exceptions = {}
compilers, ccache, is_cross, exe_wrap = self._get_compilers('objc', 'OBJC', want_cross)

@ -229,9 +229,6 @@ def run_script_command(args):
elif cmdname == 'delsuffix':
import mesonbuild.scripts.delwithsuffix as abc
cmdfunc = abc.run
elif cmdname == 'depfixer':
import mesonbuild.scripts.depfixer as abc
cmdfunc = abc.run
elif cmdname == 'dirchanger':
import mesonbuild.scripts.dirchanger as abc
cmdfunc = abc.run

@ -396,16 +396,3 @@ def fix_rpath(fname, new_rpath, verbose=True):
if shutil.which('install_name_tool'):
fix_darwin(fname, new_rpath)
return 0
def run(args):
if len(args) < 1 or len(args) > 2:
print('This application resets target rpath.')
print('Don\'t run this unless you know what you are doing.')
print('%s: <binary file> <prefix>' % sys.argv[0])
sys.exit(1)
fname = args[0]
new_rpath = None if len(args) == 1 else args[1]
return fix_rpath(fname, new_rpath)
if __name__ == '__main__':
sys.exit(run(sys.argv[1:]))

Loading…
Cancel
Save