mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-11-28 19:19:53 +00:00
Code Issues 1 Releases Wiki Activity

Merge pull request #668 from ffontaine/master

Browse Source 
meson.build: fix build without threads
This commit is contained in:
Calvin Rose 2021-03-19 15:44:25 -05:00 committed by GitHub
commit 37d6cb469b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meson.build
View File

@ -60,7 +60,7 @@ conf.set('JANET_NO_SOURCEMAPS', not get_option('sourcemaps'))
conf.set('JANET_NO_ASSEMBLER', not get_option('assembler')) conf.set('JANET_NO_ASSEMBLER', not get_option('assembler'))
conf.set('JANET_NO_PEG', not get_option('peg')) conf.set('JANET_NO_PEG', not get_option('peg'))
conf.set('JANET_NO_NET', not get_option('net')) conf.set('JANET_NO_NET', not get_option('net'))
conf.set('JANET_NO_EV', not get_option('ev')) conf.set('JANET_NO_EV', not get_option('ev') or get_option('single_threaded'))
conf.set('JANET_REDUCED_OS', get_option('reduced_os')) conf.set('JANET_REDUCED_OS', get_option('reduced_os'))
conf.set('JANET_NO_TYPED_ARRAY', not get_option('typed_array')) conf.set('JANET_NO_TYPED_ARRAY', not get_option('typed_array'))
conf.set('JANET_NO_INT_TYPES', not get_option('int_types')) conf.set('JANET_NO_INT_TYPES', not get_option('int_types'))
@ -173,9 +173,14 @@ janetc = custom_target('janetc',
'JANET_PATH', janet_path, 'JANET_HEADERPATH', header_path 'JANET_PATH', janet_path, 'JANET_HEADERPATH', header_path
]) ])
janet_dependencies = [m_dep, dl_dep]
if not get_option('single_threaded')
janet_dependencies += thread_dep
endif
libjanet = library('janet', janetc, libjanet = library('janet', janetc,
include_directories : incdir, include_directories : incdir,
dependencies : [m_dep, dl_dep, thread_dep], dependencies : janet_dependencies,
version: meson.project_version(), version: meson.project_version(),
soversion: version_parts[0] + '.' + version_parts[1], soversion: version_parts[0] + '.' + version_parts[1],
install : true) install : true)
@ -189,7 +194,7 @@ else
endif endif
janet_mainclient = executable('janet', janetc, mainclient_src, janet_mainclient = executable('janet', janetc, mainclient_src,
include_directories : incdir, include_directories : incdir,
dependencies : [m_dep, dl_dep, thread_dep], dependencies : janet_dependencies,
c_args : extra_cflags, c_args : extra_cflags,
install : true) install : true)
@ -202,7 +207,7 @@ if meson.is_cross_build()
endif endif
janet_nativeclient = executable('janet-native', janetc, mainclient_src, janet_nativeclient = executable('janet-native', janetc, mainclient_src,
include_directories : incdir, include_directories : incdir,
dependencies : [m_dep, dl_dep, thread_dep], dependencies : janet_dependencies,
c_args : extra_native_cflags, c_args : extra_native_cflags,
native : true) native : true)
else else