aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBinh Nguyen <crziter@gmail.com>2019-11-12 13:54:49 +0700
committerJussi Pakkanen <jpakkane@gmail.com>2019-11-12 20:39:23 +0200
commitf6758f24340ff495ba5befa21d65787f38fe7a72 (patch)
treed18ba2021f738747a14d54ef7175dcc56c5088e4
parentad20067ed2a29705002828ceb33a92d3ed2df7a6 (diff)
downloadmeson-f6758f24340ff495ba5befa21d65787f38fe7a72.zip
meson-f6758f24340ff495ba5befa21d65787f38fe7a72.tar.gz
meson-f6758f24340ff495ba5befa21d65787f38fe7a72.tar.bz2
Prevent install_name_tool to run on EXE when cross compile on OSX
-rw-r--r--mesonbuild/scripts/depfixer.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py
index 9925f4e..5be7d40 100644
--- a/mesonbuild/scripts/depfixer.py
+++ b/mesonbuild/scripts/depfixer.py
@@ -431,8 +431,8 @@ def fix_rpath(fname, new_rpath, final_path, install_name_mappings, verbose=True)
# Static libraries never have rpaths
if fname.endswith('.a'):
return
- # DLLs never have rpaths
- if fname.endswith('.dll'):
+ # DLLs and EXE never have rpaths
+ if fname.endswith('.dll') or fname.endswith('.exe'):
return
try:
if fname.endswith('.jar'):