summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Withnall <pwithnall@gnome.org>2023-12-05 11:25:47 +0000
committerPhilip Withnall <pwithnall@gnome.org>2023-12-05 11:27:17 +0000
commit1e7b848bab113136cf45061d8351a23c78ab015d (patch)
tree628e523e1261e4da1a4eb7fd741acfba5da7993b
parentc71030029c40726992377d748bddef0f7164718b (diff)
build: Stop hard-coding native:true for the build
The cross/native compilation properties should be set up at the top level of the build, not on particular build targets (particularly because xdgmime doesn’t actually try and run these built binaries during the build). Specifically, if shared-mime-info wants to run binaries built by its xdgmime subproject during its build, it should specify native:true when requesting the xdgmime dependency. Signed-off-by: Philip Withnall <pwithnall@gnome.org>
-rw-r--r--meson.build1
-rw-r--r--src/meson.build4
2 files changed, 0 insertions, 5 deletions
diff --git a/meson.build b/meson.build
index 215415b..9b71f5f 100644
--- a/meson.build
+++ b/meson.build
@@ -25,7 +25,6 @@ add_project_arguments(
'-Werror=sign-compare',
'-Werror=unused-result',
language: 'c',
- native: true,
)
subdir('src')
diff --git a/src/meson.build b/src/meson.build
index 1d4da89..d8e4777 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -11,7 +11,6 @@ xdgmime_sources = [
libxdgmime = static_library('xdgmime',
sources: xdgmime_sources,
- native: true,
)
libxdgmime_dep = declare_dependency(
@@ -22,7 +21,6 @@ meson.override_dependency('xdgmime', libxdgmime_dep)
test_mime = executable('test-mime',
'test-mime.c',
link_with: libxdgmime,
- native: true,
install: false,
)
meson.override_find_program('test-mime', test_mime)
@@ -30,7 +28,6 @@ meson.override_find_program('test-mime', test_mime)
test_mime_data = executable('test-mime-data',
'test-mime-data.c',
link_with: libxdgmime,
- native: true,
install: false,
)
meson.override_find_program('test-mime-data', test_mime_data)
@@ -38,7 +35,6 @@ meson.override_find_program('test-mime-data', test_mime_data)
print_mime_data = executable('print-mime-data',
'print-mime-data.c',
link_with: libxdgmime,
- native: true,
install: false,
)
meson.override_find_program('print-mime-data', print_mime_data)