diff options
| author |  Ken Payson <kpayson@google.com> | 2017-06-15 17:32:49 -0700 |
|---|---|---|
| committer | Ken Payson <kpayson@google.com> | 2017-06-15 17:35:58 -0700 |
| commit | f8d6fb7a94f3ff57f01322f87c34a48667f124ae (patch) | |
| tree | de7619b5d74786505a111896087ac067c3085583 /templates | |
| parent | b6a42bdf1c14f9f84af45a9463f2ac4243f71b9c (diff) | |
Update boringssl
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 3 | ||||
| -rw-r--r-- | templates/binding.gyp.template | 16 |
2 files changed, 17 insertions, 2 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 59a0aaa7cf..051a475d47 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -212,6 +212,9 @@ CFLAGS += -std=c99 -Wsign-conversion -Wconversion ${' '.join(warning_var('$(W_%s)', warning) for warning in PREFERRED_WARNINGS)} CXXFLAGS += -std=c++11 + ifeq ($(SYSTEM),Darwin) + CXXFLAGS += -stdlib=libc++ + endif % for arg in ['CFLAGS', 'CXXFLAGS', 'CPPFLAGS', 'LDFLAGS', 'DEFINES']: % if defaults.get('global', []).get(arg, None) is not None: ${arg} += ${defaults.get('global').get(arg)} diff --git a/templates/binding.gyp.template b/templates/binding.gyp.template index 935943158d..921cd8c8c5 100644 --- a/templates/binding.gyp.template +++ b/templates/binding.gyp.template @@ -167,6 +167,7 @@ % if lib.name in module.transitive_deps and lib.name == 'boringssl': { 'cflags': [ + '-std=c++11', '-std=c99', '-Wall', '-Werror' @@ -183,12 +184,23 @@ % for source in lib.src: '${source}', % endfor - ] + ], + 'conditions': [ + ['OS=="mac"', { + 'xcode_settings': { + 'MACOSX_DEPLOYMENT_TARGET': '10.9', + 'OTHER_CPLUSPLUSFLAGS': [ + '-stdlib=libc++', + '-std=c++11' + ], + } + }], + ], }, % endif % endfor % endfor - ] + ], }], ['OS == "win" and runtime!="electron"', { 'targets': [ |