diff -r 2b9f54d14cc2 -r 99d80cbe2eb4 update/Makefile.am
--- a/update/Makefile.am	Sat Nov 15 19:04:45 2014 +0000
+++ b/update/Makefile.am	Mon Apr 18 15:04:47 2016 +0100
@@ -1,12 +1,14 @@
 AM_CFLAGS=-g $(SETUP_CFLAGS)
 LDADD=../plover/libplover.la $(SETUP_LIBS)
 INCLUDES=-I$(top_srcdir)
+CCLD = $(CXX)
 
 bin_PROGRAMS=update
 bin_SCRIPTS=update.js
 
 update_SOURCES=update.c
 update_LDFLAGS=-all-static
+update_LIBTOOLFLAGS=--tag=CXX
 if HAVE_WINDRES
 update_SOURCES+=resources.rc update.exe.manifest
 endif