Skip to content

Commit

Permalink
Make it work on macOS.
Browse files Browse the repository at this point in the history
  • Loading branch information
jpakkane committed Jan 16, 2019
1 parent 7cd4745 commit 5bdd604
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 1 deletion.
4 changes: 4 additions & 0 deletions mesonbuild/compilers/c.py
Original file line number Diff line number Diff line change
Expand Up @@ -1156,6 +1156,10 @@ def get_linker_always_args(self):
return basic + ['-Wl,-headerpad_max_install_names']
return basic

def get_symbol_export_file_args(self, path):
if self.compiler_type.is_osx_compiler:
return ['-Wl,-exported_symbols_list', path]
return ['-Wl,--version-script=' + path]

class ArmclangCCompiler(ArmclangCompiler, CCompiler):
def __init__(self, exelist, version, compiler_type, is_cross, exe_wrapper=None, **kwargs):
Expand Down
1 change: 1 addition & 0 deletions test cases/common/211 version file/bob-clang.map
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_bobMcBob
1 change: 1 addition & 0 deletions test cases/common/211 version file/bob-clang.map.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_@in@
2 changes: 1 addition & 1 deletion test cases/common/211 version file/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cc = meson.get_compiler('c')
if cc.get_id() == 'msvc'
suffix = '.sym'
else
suffix = '.map'
suffix = host_machine.system() == 'darwin' ? '-clang.map' : '.map'
endif

mapfile = 'bob' + suffix
Expand Down
1 change: 1 addition & 0 deletions test cases/common/211 version file/sub/foo-clang.map
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_bobMcBob

0 comments on commit 5bdd604

Please sign in to comment.