From 44a09e6d778d99c0754682b584f43f125631d8a8 Mon Sep 17 00:00:00 2001 From: mapsam Date: Tue, 15 Mar 2022 08:30:02 -0700 Subject: [PATCH] update xcode12 --- .travis.yml | 6 +++--- binding.gyp | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 48d3b9a..eec2eb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,12 +68,12 @@ matrix: node_js: 13 # osx publishable node v10/release - os: osx - osx_image: xcode11 + osx_image: xcode12.4 env: BUILDTYPE=release node_js: 10 # osx publishable node v12/release - os: osx - osx_image: xcode11 + osx_image: xcode12.4 env: BUILDTYPE=release node_js: 12 # linux sanitizer build node v10/debug @@ -89,7 +89,7 @@ matrix: - true # osx sanitizer build node v10/debug - os: osx - osx_image: xcode11 + osx_image: xcode12.4 env: BUILDTYPE=debug TOOLSET=asan node_js: 10 sudo: required diff --git a/binding.gyp b/binding.gyp index f5b7772..8fe9303 100644 --- a/binding.gyp +++ b/binding.gyp @@ -1,13 +1,13 @@ # This file inherits default targets for Node addons, see https://github.com/nodejs/node-gyp/blob/master/addon.gypi { - # https://github.com/springmeyer/gyp/blob/master/test/make_global_settings/wrapper/wrapper.gyp - 'make_global_settings': [ - ['CXX', '<(module_root_dir)/mason_packages/.link/bin/clang++'], - ['CC', '<(module_root_dir)/mason_packages/.link/bin/clang'], - ['LINK', '<(module_root_dir)/mason_packages/.link/bin/clang++'], - ['AR', '<(module_root_dir)/mason_packages/.link/bin/llvm-ar'], - ['NM', '<(module_root_dir)/mason_packages/.link/bin/llvm-nm'] - ], + # # https://github.com/springmeyer/gyp/blob/master/test/make_global_settings/wrapper/wrapper.gyp + # 'make_global_settings': [ + # ['CXX', '<(module_root_dir)/mason_packages/.link/bin/clang++'], + # ['CC', '<(module_root_dir)/mason_packages/.link/bin/clang'], + # ['LINK', '<(module_root_dir)/mason_packages/.link/bin/clang++'], + # ['AR', '<(module_root_dir)/mason_packages/.link/bin/llvm-ar'], + # ['NM', '<(module_root_dir)/mason_packages/.link/bin/llvm-nm'] + # ], 'includes': [ 'common.gypi' ], # brings in a default set of options that are inherited from gyp 'variables': { # custom variables we use specific to this file 'error_on_warnings%':'true', # can be overriden by a command line variable because of the % sign using "WERROR" (defined in Makefile)