[gnome-builder: 10/139] build: rename -Dwith_tcmalloc to -Dtcmalloc=true
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder: 10/139] build: rename -Dwith_tcmalloc to -Dtcmalloc=true
- Date: Thu, 10 Jan 2019 04:18:09 +0000 (UTC)
commit d7eb69adec1c8c9e510241beda4907fc41eb35db
Author: Christian Hergert <chergert redhat com>
Date: Wed Jan 9 15:01:35 2019 -0800
build: rename -Dwith_tcmalloc to -Dtcmalloc=true
build-aux/flatpak/org.gnome.Builder.json | 2 +-
meson.build | 4 ++--
meson_options.txt | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 269dcf626..5d5e887a2 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -518,7 +518,7 @@
"--buildtype=debugoptimized",
"-Dctags_path=/app/bin/ctags",
"-Dfusermount_wrapper=true",
- "-Dwith_tcmalloc=true",
+ "-Dtcmalloc=true",
"-Dpython_libprefix=python3.7",
"-Denable_tracing=true",
"-Dhelp=true",
diff --git a/meson.build b/meson.build
index 285c8a2b5..1c1a674d8 100644
--- a/meson.build
+++ b/meson.build
@@ -69,7 +69,7 @@ status += [
'Tracing ............... : @0@'.format(get_option('enable_tracing')),
'Profiling ............. : @0@'.format(get_option('enable_profiling')),
'fusermount ............ : @0@'.format(get_option('fusermount_wrapper')),
- 'tcmalloc_minimal ...... : @0@'.format(get_option('with_tcmalloc')),
+ 'tcmalloc_minimal ...... : @0@'.format(get_option('tcmalloc')),
'',
'Help Docs ............. : @0@'.format(get_option('with_help')),
'API Docs .............. : @0@'.format(get_option('with_docs')),
@@ -230,7 +230,7 @@ foreach link_arg: test_link_args
endforeach
add_project_link_arguments(global_link_args, language: 'c')
-if get_option('with_tcmalloc')
+if get_option('tcmalloc')
tcmalloc_ldflags = [
'-fno-builtin-malloc',
'-fno-builtin-calloc',
diff --git a/meson_options.txt b/meson_options.txt
index 0a8cc7c5d..f0150ca88 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,7 +1,7 @@
option('enable_tracing', type: 'boolean', value: false, description: 'Enable tracing of internals for
troubleshooting Builder')
option('enable_profiling', type: 'boolean', value: false, description: 'Enable profiling of the Builder
codebase')
option('fusermount_wrapper', type: 'boolean', value: false, description: 'Install fusermount-wrapper when
distributing with flatpak')
-option('with_tcmalloc', type: 'boolean', value: false, description: 'Use tcmalloc for dynamic allocations')
+option('tcmalloc', type: 'boolean', value: false, description: 'Use tcmalloc for dynamic allocations')
option('with_safe_path', type: 'string', value: '', description: 'PATH variable to run build commands
(default: platform-specific)')
option('with_channel',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]