diff --git a/electron.gyp b/electron.gyp index 090008a67ffb..e2febbaeee65 100644 --- a/electron.gyp +++ b/electron.gyp @@ -298,6 +298,10 @@ '$(SDKROOT)/System/Library/Frameworks/QTKit.framework', ], }, + 'xcode_settings': { + # ReactiveCocoa which is used by Squirrel requires using __weak. + 'CLANG_ENABLE_OBJC_WEAK': 'YES', + }, }], # OS=="mac" and mas_build==0 ['OS=="mac" and mas_build==1', { 'defines': [ diff --git a/vendor/brightray b/vendor/brightray index 75bda7d2118c..a266ffbdf446 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit 75bda7d2118c953b35d8a7d1962067a68dea34fb +Subproject commit a266ffbdf446b41b9b5d09e55134ebadd774b357