Merge pull request #989 from urbit/set-meson-flag-o3

Set meson --buildtype to release
This commit is contained in:
Anthony Arroyo 2018-05-29 13:27:08 -07:00 committed by GitHub
commit 5164bd0d67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 8 additions and 16 deletions

View File

@ -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 -Ddebug=true`.
`meson configure -Dbuildtype=debug`.
To set the prefix for installation use
`meson configure -Dprefix=/usr`, and so on.

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'])
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,

View File

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

View File

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

@ -1 +1 @@
Subproject commit 12b85b8e8a52b74d1502a1b2abc37e5c3fd4fd02
Subproject commit 8555ef14c4a503f57a0d192bb120159239f4322c

@ -1 +1 @@
Subproject commit fc17dd0778083a484c60bf9b27ecbf6bcfcd759a
Subproject commit ba4777acac5694925ab78f38577b059cd4a3e8e6

@ -1 +1 @@
Subproject commit 9698340d8d0a3f02a96867b2d02623f05e517156
Subproject commit e1e0fa353fc0051c8bb7e5b748917c4ebe76609e

@ -1 +1 @@
Subproject commit 15a52c10ae665ee6e1e3cd275bc292a343fb3394
Subproject commit 4ebe362f390025e5448e9fcf777c1f38630bc011

@ -1 +1 @@
Subproject commit 4d9f3d1f29b88661aec70179dd405773f3515249
Subproject commit 001378cbe3681af1137553ed7220c79273850d6a