aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2019-11-19 09:30:46 -0800
committerDylan Baker <dylan@pnwbakers.com>2019-12-02 16:39:06 -0800
commitef9aeb188ea2bc7353e59916c18901cde90fa2b3 (patch)
treed1525c3c53703d1adb4c077399ab39909863c7dc /run_unittests.py
parent7658e67f92ba55e2d8e466f818293a001f34a65f (diff)
downloadmeson-ef9aeb188ea2bc7353e59916c18901cde90fa2b3.zip
meson-ef9aeb188ea2bc7353e59916c18901cde90fa2b3.tar.gz
meson-ef9aeb188ea2bc7353e59916c18901cde90fa2b3.tar.bz2
Allow selecting the dynamic linker
This uses the normal meson mechanisms, an LD environment variable or via cross/native files. Fixes: #6057
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 4e56c1d..bf67729 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -445,7 +445,7 @@ class InternalTests(unittest.TestCase):
def test_compiler_args_class_gnuld(self):
cargsfunc = mesonbuild.compilers.CompilerArgs
## Test --start/end-group
- linker = mesonbuild.linkers.GnuDynamicLinker([], MachineChoice.HOST, 'fake', '-Wl,')
+ linker = mesonbuild.linkers.GnuDynamicLinker([], MachineChoice.HOST, 'fake', '-Wl,', [])
gcc = mesonbuild.compilers.GnuCCompiler([], 'fake', False, MachineChoice.HOST, mock.Mock(), linker=linker)
## Ensure that the fake compiler is never called by overriding the relevant function
gcc.get_default_include_dirs = lambda: ['/usr/include', '/usr/share/include', '/usr/local/include']
@@ -474,7 +474,7 @@ class InternalTests(unittest.TestCase):
def test_compiler_args_remove_system(self):
cargsfunc = mesonbuild.compilers.CompilerArgs
## Test --start/end-group
- linker = mesonbuild.linkers.GnuDynamicLinker([], MachineChoice.HOST, 'fake', '-Wl,')
+ linker = mesonbuild.linkers.GnuDynamicLinker([], MachineChoice.HOST, 'fake', '-Wl,', [])
gcc = mesonbuild.compilers.GnuCCompiler([], 'fake', False, MachineChoice.HOST, mock.Mock(), linker=linker)
## Ensure that the fake compiler is never called by overriding the relevant function
gcc.get_default_include_dirs = lambda: ['/usr/include', '/usr/share/include', '/usr/local/include']