jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Javascript node test-suite to use desired c++ standard

Browse source 
Passes the -std determined in configure.ac to node-gyp
This commit is contained in:
William S Fulton 2022-10-15 11:25:47 +01:00
commit e622a708d2
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Examples/test-suite/javascript/Makefile.in
View file

@ -8,6 +8,7 @@ NODEJS = @NODEJS@
SCRIPTSUFFIX = _runme.js SCRIPTSUFFIX = _runme.js
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
SO = @SO@ SO = @SO@
GYP_CXXFLAGS = @BOOST_CPPFLAGS@ @PLATCXXFLAGS@
HAVE_CXX11 = @HAVE_CXX11@ HAVE_CXX11 = @HAVE_CXX11@
HAVE_CXX14 = @HAVE_CXX14@ HAVE_CXX14 = @HAVE_CXX14@
@ -63,7 +64,7 @@ ifeq (node,$(JSENGINE))
setup_node = \ setup_node = \
test -d $* || mkdir $* && \ test -d $* || mkdir $* && \
sed -e 's|$$testcase|$*|g; s|$$cflags|$(GYP_CFLAGS)|g; s|$$srcdir|$(srcdir)|g' \ sed -e 's|$$testcase|$*|g; s|$$cflags|$(GYP_CFLAGS)|g; s|$$cxxflags|"$(GYP_CXXFLAGS)"|g; s|$$srcdir|$(srcdir)|g' \
$(srcdir)/node_template/binding.gyp.in > $*/binding.gyp && \ $(srcdir)/node_template/binding.gyp.in > $*/binding.gyp && \
sed -e 's|$$testcase|$*|g;' \ sed -e 's|$$testcase|$*|g;' \
$(srcdir)/node_template/index.js.in > $*/index.js $(srcdir)/node_template/index.js.in > $*/index.js

2
Examples/test-suite/javascript/node_template/binding.gyp.in
View file

@ -19,7 +19,7 @@
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"',
{ {
'cflags': [ "-Wno-unused-variable", "-Wno-unused-but-set-variable", "-Wno-unused-but-set-parameter", $cflags], 'cflags': [ "-Wno-unused-variable", "-Wno-unused-but-set-variable", "-Wno-unused-but-set-parameter", $cflags],
'cflags_cc': [ "-Wno-unused-variable", "-Wno-unused-but-set-variable", "-Wno-unused-but-set-parameter", $cflags], 'cflags_cc': [ "-Wno-unused-variable", "-Wno-unused-but-set-variable", "-Wno-unused-but-set-parameter", $cxxflags, $cflags],
'cflags!': [ '-fno-exceptions' ], 'cflags!': [ '-fno-exceptions' ],
'cflags_cc!': [ '-fno-exceptions', '-fno-rtti' ] 'cflags_cc!': [ '-fno-exceptions', '-fno-rtti' ]
} }