diff options
author | Stefan Schmidt <s.schmidt@samsung.com> | 2020-06-03 09:18:02 +0200 |
---|---|---|
committer | Stefan Schmidt <s.schmidt@samsung.com> | 2020-06-03 11:03:12 +0200 |
commit | 338a529af190f0c9c285e932a765f39ae4047a03 (patch) | |
tree | b2502bb16e7cd11c4db21b2790d1bffb968f1f43 /src/bin/elementary/meson.build | |
parent | 0b4f42fab65c34a37ddb7998e750597db3690d9c (diff) |
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 <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D11919
Diffstat (limited to '')
-rw-r--r-- | src/bin/elementary/meson.build | 14 |
1 files changed, 0 insertions, 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 = [ | |||
169 | 169 | ||
170 | if sys_windows == false | 170 | if sys_windows == false |
171 | link_args = ['-rdynamic', '-fPIC', '-pie'] | 171 | link_args = ['-rdynamic', '-fPIC', '-pie'] |
172 | link_args_lib = ['-rdynamic', '-fPIC'] | ||
173 | package_c_args = package_c_args + ['-fPIC'] | 172 | package_c_args = package_c_args + ['-fPIC'] |
174 | else | 173 | else |
175 | link_args = [] | 174 | link_args = [] |
176 | link_args_lib = [] | ||
177 | endif | 175 | endif |
178 | elementary_test = executable('elementary_test', | 176 | elementary_test = executable('elementary_test', |
179 | elementary_test_src, | 177 | elementary_test_src, |
@@ -187,18 +185,6 @@ elementary_test = executable('elementary_test', | |||
187 | link_args: link_args | 185 | link_args: link_args |
188 | ) | 186 | ) |
189 | 187 | ||
190 | library('elementary_test', | ||
191 | elementary_test_src, | ||
192 | dependencies: [elementary, intl] + elementary_deps + elementary_pub_deps, | ||
193 | install: false, | ||
194 | c_args : package_c_args + [ | ||
195 | '-Delementary_test_BIN_DIR="'+dir_bin+'"', | ||
196 | '-Delementary_test_LIB_DIR="'+dir_lib+'"', | ||
197 | '-Delementary_test_DATA_DIR="'+join_paths(dir_data,'elementary')+'"' | ||
198 | ], | ||
199 | link_args: link_args_lib | ||
200 | ) | ||
201 | |||
202 | elementary_config_src = [ | 188 | elementary_config_src = [ |
203 | 'config.c' | 189 | 'config.c' |
204 | ] | 190 | ] |