[template-glib] build: remove use of linker script
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [template-glib] build: remove use of linker script
- Date: Wed, 8 Nov 2017 21:47:57 +0000 (UTC)
commit dc3d84cdeeabfb892217ebfe922e5c5545c64cb5
Author: Christian Hergert <chergert redhat com>
Date: Wed Nov 8 13:43:25 2017 -0800
build: remove use of linker script
meson.build | 6 ------
src/meson.build | 7 -------
src/template-glib.map | 6 ------
3 files changed, 0 insertions(+), 19 deletions(-)
---
diff --git a/meson.build b/meson.build
index 63f53c6..8e79b6c 100644
--- a/meson.build
+++ b/meson.build
@@ -82,12 +82,6 @@ add_project_arguments(
language: 'c'
)
-# Check if we can use version scripts for ABI exports
-ld_supports_version_script = cc.links('''
- int main (void) { return 0; }
-''', args: '-Wl,--version-script,' + join_paths(meson.source_root(), 'src/template-glib.map'))
-message('Linker supports --version-script: @0@'.format(ld_supports_version_script))
-
# Setup various paths that subdirectory meson.build files need
package_subdir = get_option('package_subdir')
libdir = join_paths(get_option('libdir'), package_subdir)
diff --git a/src/meson.build b/src/meson.build
index 3398f62..08d325b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -141,17 +141,10 @@ if libdir == '' or includedir == ''
error('You must set pkglibdir and pkgincludedir when using as a subproject')
endif
-libtemplate_glib_link_args = []
-if ld_supports_version_script
-libtemplate_glib_link_args += [ '-Wl,--version-script,' + join_paths(meson.current_source_dir(),
'template-glib.map') ]
-endif
-
libtemplate_glib = library(
'template_glib-' + apiversion,
libtemplate_glib_sources,
- link_depends: 'template-glib.map',
- link_args: libtemplate_glib_link_args,
dependencies: libtemplate_glib_deps,
soversion: soversion,
version: libversion,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]