Merge pull request #988 from urbit/fix-revert-meson-flags

Revert "Merge pull request #977 from urbit/meson-build-type"

README.md

@@ -56,7 +56,7 @@ are included as git submodules. To build urbit from source, perform the followin
 To configure project, enter the build directory and enter
 `meson configure`. Without any arguments this command will display available
 options. For example, to compile debug build of urbit, use
-`meson configure -Dbuildtype=debug`.
+`meson configure -Ddebug=true`.
 To set the prefix for installation use
 `meson configure -Dprefix=/usr`, and so on.
 

meson.build

@@ -306,10 +306,17 @@ 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 : os_c_flags,
+c_args : opt_flags + os_c_flags,
 link_args: os_link_flags,
 dependencies: [openssl_dep,
                curl_dep,

meson_options.txt

@@ -0,0 +1 @@
+option('debug', type:'boolean', value: false)

scripts/build

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 mkdir ./build &> /dev/null
-meson . ./build -Dbuildtype=release
+meson . ./build
 ninja -C build