aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorNikita Churaev <lamefun.x0r@gmail.com>2018-01-09 22:36:13 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2018-01-09 21:36:13 +0200
commitde8018a17d9b84b2a57761ad624cc669c4e136a4 (patch)
tree171b7c8b1b342d4aec99a371d05fbac9fddfc25d /mesonbuild
parent398aed6e4991016c0bba4ee829bf65f98f1a6447 (diff)
downloadmeson-de8018a17d9b84b2a57761ad624cc669c4e136a4.zip
meson-de8018a17d9b84b2a57761ad624cc669c4e136a4.tar.gz
meson-de8018a17d9b84b2a57761ad624cc669c4e136a4.tar.bz2
Add `export_dynamic` argument to `executable`. (#2662)
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/backend/ninjabackend.py3
-rw-r--r--mesonbuild/build.py25
-rw-r--r--mesonbuild/compilers/c.py8
-rw-r--r--mesonbuild/interpreter.py2
4 files changed, 30 insertions, 8 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 2429fba..2945d6a 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -2341,6 +2341,9 @@ rule FORTRAN_DEP_HACK
# If gui_app, and that's significant on this platform
if target.gui_app and hasattr(linker, 'get_gui_app_args'):
commands += linker.get_gui_app_args()
+ # If export_dynamic, add the appropriate linker arguments
+ if target.export_dynamic:
+ commands += linker.gen_export_dynamic_link_args(self.environment)
# If implib, and that's significant on this platform (i.e. Windows using either GCC or Visual Studio)
if target.import_filename:
commands += linker.gen_import_library_args(os.path.join(self.get_target_dir(target), target.import_filename))
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 8a2e716..16a18a9 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -82,6 +82,7 @@ known_lib_kwargs.update({'version': True, # Only for shared libs
known_exe_kwargs = known_basic_kwargs.copy()
known_exe_kwargs.update({'implib': True,
+ 'export_dynamic': True
})
class InvalidArguments(MesonException):
@@ -1160,23 +1161,33 @@ class Executable(BuildTarget):
# The import library that GCC would generate (and prefer)
self.gcc_import_filename = None
- # if implib appears, this target is linkwith:-able, but that only means
- # something on Windows platforms.
- self.is_linkwithable = False
- if 'implib' in kwargs and kwargs['implib']:
+ # Check for export_dynamic
+ self.export_dynamic = False
+ if kwargs.get('export_dynamic'):
+ if not isinstance(kwargs['export_dynamic'], bool):
+ raise InvalidArguments('"export_dynamic" keyword argument must be a boolean')
+ self.export_dynamic = True
+ if kwargs.get('implib'):
+ self.export_dynamic = True
+ if self.export_dynamic and kwargs.get('implib') is False:
+ raise InvalidArguments('"implib" keyword argument must not be false for if "export_dynamic" is true')
+
+ # If using export_dynamic, set the import library name
+ if self.export_dynamic:
implib_basename = self.name + '.exe'
- if not isinstance(kwargs['implib'], bool):
+ if not isinstance(kwargs.get('implib', False), bool):
implib_basename = kwargs['implib']
- self.is_linkwithable = True
if for_windows(is_cross, environment) or for_cygwin(is_cross, environment):
self.vs_import_filename = '{0}.lib'.format(implib_basename)
self.gcc_import_filename = 'lib{0}.a'.format(implib_basename)
-
if self.get_using_msvc():
self.import_filename = self.vs_import_filename
else:
self.import_filename = self.gcc_import_filename
+ # Only linkwithable if using export_dynamic
+ self.is_linkwithable = self.export_dynamic
+
def type_suffix(self):
return "@exe"
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
index 233fc84..4c6e3a2 100644
--- a/mesonbuild/compilers/c.py
+++ b/mesonbuild/compilers/c.py
@@ -183,6 +183,14 @@ class CCompiler(Compiler):
def get_default_include_dirs(self):
return []
+ def gen_export_dynamic_link_args(self, env):
+ if for_windows(env.is_cross_build(), env):
+ return ['-Wl,--export-all-symbols']
+ elif for_darwin(env.is_cross_build(), env):
+ return []
+ else:
+ return ['-Wl,-export-dynamic']
+
def gen_import_library_args(self, implibname):
"""
The name of the outputted import library
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 48b8d82..488c2a3 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1347,7 +1347,7 @@ build_target_common_kwargs = (
rust_kwargs |
cs_kwargs)
-exe_kwargs = (build_target_common_kwargs) | {'implib'}
+exe_kwargs = (build_target_common_kwargs) | {'implib', 'export_dynamic'}
shlib_kwargs = (build_target_common_kwargs) | {'version', 'soversion'}
shmod_kwargs = shlib_kwargs
stlib_kwargs = shlib_kwargs