ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-07 07:30:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Use built in "buildrelease" flag instead of custom "debug=true" flag.
This commit is contained in:
Elliot Glaysher 2018-05-07 16:20:44 -07:00 committed by GitHub
commit 26996c2b16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
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 To configure project, enter the build directory and enter
`meson configure`. Without any arguments this command will display available `meson configure`. Without any arguments this command will display available
options. For example, to compile debug build of urbit, use 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 To set the prefix for installation use
`meson configure -Dprefix=/usr`, and so on. `meson configure -Dprefix=/usr`, and so on.

9
meson.build
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,

1
meson_options.txt
View File

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

2
scripts/build
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