Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions escargot.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"escargot_lib_type%": 'shared_lib', # static_lib | shared_lib
'escargot_threading%': '<(escargot_threading)',
'escargot_debugger%': '<(escargot_debugger)',
'asan_configs%': [],
'conditions': [
['escargot_lib_type=="shared_lib"', {
'lib_ext': '.so'
Expand Down Expand Up @@ -55,9 +56,15 @@
'-DESCARGOT_ASAN=<(asan)',
'-DESCARGOT_DEBUGGER=<(escargot_debugger)',
'-DCMAKE_POLICY_VERSION_MINIMUM=3.5',
'-DCMAKE_C_FLAGS=-DALWAYS_SMALL_CLEAR_STACK',
'-DCMAKE_CXX_FLAGS=-DALWAYS_SMALL_CLEAR_STACK',
],
'conditions': [
['asan == 1', {
'asan_configs': [
'-DCMAKE_C_FLAGS=-DALWAYS_SMALL_CLEAR_STACK',
'-DCMAKE_CXX_FLAGS=-DALWAYS_SMALL_CLEAR_STACK',
]} ,
],
]
},
'all_dependent_settings': {
'libraries': [
Expand Down Expand Up @@ -102,7 +109,7 @@
'action_name': 'print configs',
'inputs': [],
'outputs': ['<(SHARED_INTERMEDIATE_DIR)'],
'action': ['printf', '%s\\n', '<@(escargot_configs)'],
'action': ['printf', '%s\\n', '<@(escargot_configs)', '<@(asan_configs)'],
},
{
'action_name': 'config escargot',
Expand All @@ -112,6 +119,7 @@
'cmake', '<(escargot_dir)', '-B<(output_dir)',
'-GNinja',
'<@(escargot_configs)',
'<@(asan_configs)',
],
},
{
Expand Down
4 changes: 2 additions & 2 deletions include/lwnode/lwnode-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@

#define LWNODE_VERSION_MAJOR 1
#define LWNODE_VERSION_MINOR 0
#define LWNODE_VERSION_PATCH 16
#define LWNODE_VERSION_TAG "v1.0.16"
#define LWNODE_VERSION_PATCH 17
#define LWNODE_VERSION_TAG "v1.0.17"