From 44b210b23825267992cd5cb41c1c72504dbb4b59 Mon Sep 17 00:00:00 2001
From: Elliot Glaysher <elliot@tlon.io>
Date: Mon, 7 May 2018 16:10:10 -0700
Subject: [PATCH] Removes non-functional meson debug option.

It looks like the debug mode was copied literally from the old
Makefiles, which interacts poorly with meson and leads to builds
with "-O0 -g -O3".

The correct way to do this is to use "-Dbuildtype=release" or
"-Dbuildtype=debug" during configuration. Set the default builds
made by scripts/build to release.
---
 meson.build       | 9 +--------
 meson_options.txt | 1 -
 scripts/build     | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 meson_options.txt

diff --git a/meson.build b/meson.build
index eff66da1c..824ac4fd2 100644
--- a/meson.build
+++ b/meson.build
@@ -306,17 +306,10 @@ softfloat3_dep = dependency('softfloat3', version: '>=3.0.0', fallback: ['softfl
 libuv_dep = dependency('libuv', version: '>=1.8.0', fallback:['libuv', 'libuv_dep'])
 libh2o_dep = dependency('libh2o', version: '>=0.13.3', fallback: ['libh2o', 'libh2o_dep'])
 
-opt_flags = []
-if get_option('debug')
-  opt_flags = ['-g']
-else
-  opt_flags = ['-O3']
-endif
-
 executable('urbit',
 sources : sources,
 include_directories : incdir,
-c_args : opt_flags + os_c_flags,
+c_args : os_c_flags,
 link_args: os_link_flags,
 dependencies: [openssl_dep,
                curl_dep,
diff --git a/meson_options.txt b/meson_options.txt
deleted file mode 100644
index 378902f8d..000000000
--- a/meson_options.txt
+++ /dev/null
@@ -1 +0,0 @@
-option('debug', type:'boolean', value: false)
diff --git a/scripts/build b/scripts/build
index 7aa65d1a4..01d1bb3f8 100755
--- a/scripts/build
+++ b/scripts/build
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 mkdir ./build &> /dev/null
-meson . ./build
+meson . ./build -Dbuildtype=release
 ninja -C build