update xcode12

mapsam · mapsam · commit 44a09e6d778d · 2022-03-15T08:30:02.000-07:00
diff --git 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
@@ -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)
