From 338a529af190f0c9c285e932a765f39ae4047a03 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Wed, 3 Jun 2020 09:18:02 +0200 Subject: [PATCH] Revert "elementary: build elementary_test additionally as shared object" We now longer need this workaround. Exactness is now pre-loaded and we can run it with any executable without this trick. Remove to simplify our build. This reverts commit 78ad088dd73a18fb4cfcfedcc18a6bf03e28080b. Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D11919 --- src/bin/elementary/meson.build | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/bin/elementary/meson.build b/src/bin/elementary/meson.build index de731e55cf..1bad71570c 100644 --- a/src/bin/elementary/meson.build +++ b/src/bin/elementary/meson.build @@ -169,11 +169,9 @@ elementary_test_src = [ if sys_windows == false link_args = ['-rdynamic', '-fPIC', '-pie'] - link_args_lib = ['-rdynamic', '-fPIC'] package_c_args = package_c_args + ['-fPIC'] else link_args = [] - link_args_lib = [] endif elementary_test = executable('elementary_test', elementary_test_src, @@ -187,18 +185,6 @@ elementary_test = executable('elementary_test', link_args: link_args ) -library('elementary_test', - elementary_test_src, - dependencies: [elementary, intl] + elementary_deps + elementary_pub_deps, - install: false, - c_args : package_c_args + [ - '-Delementary_test_BIN_DIR="'+dir_bin+'"', - '-Delementary_test_LIB_DIR="'+dir_lib+'"', - '-Delementary_test_DATA_DIR="'+join_paths(dir_data,'elementary')+'"' - ], - link_args: link_args_lib -) - elementary_config_src = [ 'config.c' ]