MacVim build broken by 7.4.1185

[chdiza]

Plain Vim 7.4.1185 builds fine.

MacVim 7.4.1185 fails to build on El Cap. I see the following compiler warning during the Vim phase:

gcc -c -I. -Iproto -DHAVE_CONFIG_H -DFEAT_GUI_MACVIM -Wall -Wno-unknown-pragmas -pipe  -DMACOS_X_UNIX  -g -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1       -o objects/memfile.o memfile.c
channel.c:261:16: warning: unused variable 'channel' [-Wunused-variable]
    channel_T   *channel = &channels[idx];
                 ^
1 warning generated.

Then later down:

gcc   -L/usr/local/lib  -o Vim objects/buffer.o objects/blowfish.o objects/charset.o objects/crypt.o objects/crypt_zip.o objects/diff.o objects/digraph.o objects/edit.o objects/eval.o objects/ex_cmds.o objects/ex_cmds2.o objects/ex_docmd.o objects/ex_eval.o objects/ex_getln.o objects/fileio.o objects/fold.o objects/getchar.o objects/hardcopy.o objects/hashtab.o  objects/if_cscope.o objects/if_xcmdsrv.o objects/json.o objects/mark.o objects/memline.o objects/menu.o objects/message.o objects/misc1.o objects/misc2.o objects/move.o objects/mbyte.o objects/normal.o objects/ops.o objects/option.o objects/os_unix.o objects/pathdef.o objects/popupmnu.o objects/quickfix.o objects/regexp.o objects/screen.o objects/search.o objects/sha256.o objects/spell.o objects/syntax.o  objects/tag.o objects/term.o objects/ui.o objects/undo.o objects/version.o objects/window.o objects/gui.o objects/gui_beval.o objects/pty.o objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o        objects/os_macosx.o objects/os_mac_conv.o   objects/channel.o  objects/main.o objects/memfile.o -framework Cocoa -framework Carbon       -lm -lncurses  -liconv -framework Cocoa
Undefined symbols for architecture x86_64:
  "_gui_macvim_set_netbeans_socket", referenced from:
      _channel_gui_register_all in channel.o
      _channel_open in channel.o
      _channel_close in channel.o
      _channel_read in channel.o
ld: symbol(s) not found for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
make[1]: *** [Vim] Error 1
make: *** [first] Error 2

[chdiza]

My configure flags for MacVim are:

    --disable-netbeans
    --disable-nls

I also pass those to plain Vim, and it builds just fine.