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.
This commit is contained in:
Elliot Glaysher 2018-05-07 16:10:10 -07:00
parent 38f9c546c4
commit 44b210b238
3 changed files with 2 additions and 10 deletions

View File

@ -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']) libuv_dep = dependency('libuv', version: '>=1.8.0', fallback:['libuv', 'libuv_dep'])
libh2o_dep = dependency('libh2o', version: '>=0.13.3', fallback: ['libh2o', 'libh2o_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', executable('urbit',
sources : sources, sources : sources,
include_directories : incdir, include_directories : incdir,
c_args : opt_flags + os_c_flags, c_args : os_c_flags,
link_args: os_link_flags, link_args: os_link_flags,
dependencies: [openssl_dep, dependencies: [openssl_dep,
curl_dep, curl_dep,

View File

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

View File

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