aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2020-02-12 03:12:52 +0530
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2020-02-17 23:58:20 +0530
commit2860bd03859bd75835f1b7e78cb94e94665d5520 (patch)
tree078550711e75eaeec353f456236604ed672599da
parent561a284c512ab262ae669ceb2d26dee77f1c4bc1 (diff)
downloadmeson-2860bd03859bd75835f1b7e78cb94e94665d5520.zip
meson-2860bd03859bd75835f1b7e78cb94e94665d5520.tar.gz
meson-2860bd03859bd75835f1b7e78cb94e94665d5520.tar.bz2
depfixer: Ignore more extensions that can't need RPATH fixes
Generated headers, PDB files, import libraries, etc. Speed-up in gst-build on Windows: ``` meson install before: 5.4 seconds after: 5.1 seconds meson install --only-changed before: 2.7 seconds after: 1.6 seconds ```
-rw-r--r--mesonbuild/scripts/depfixer.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py
index 969f1cc..5ba3a97 100644
--- a/mesonbuild/scripts/depfixer.py
+++ b/mesonbuild/scripts/depfixer.py
@@ -432,11 +432,10 @@ def fix_jar(fname):
def fix_rpath(fname, new_rpath, final_path, install_name_mappings, verbose=True):
global INSTALL_NAME_TOOL
- # Static libraries never have rpaths
- if fname.endswith('.a'):
- return
- # DLLs and EXE never have rpaths
- if fname.endswith('.dll') or fname.endswith('.exe'):
+ # Static libraries, import libraries, debug information, headers, etc
+ # never have rpaths
+ # DLLs and EXE currently do not need runtime path fixing
+ if fname.endswith(('.a', '.lib', '.pdb', '.h', '.hpp', '.dll', '.exe')):
return
try:
if fname.endswith('.jar'):