diff -r 2b9f54d14cc2 -r 6b3034a884dc setup/Makefile.am
--- a/setup/Makefile.am	Sat Nov 15 19:04:45 2014 +0000
+++ b/setup/Makefile.am	Thu Jun 16 18:00:21 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=setup
 bin_SCRIPTS=setup.js
 
 setup_SOURCES=setup.c
 setup_LDFLAGS=-all-static
+setup_LIBTOOLFLAGS=--tag=CXX
 if HAVE_WINDRES
 setup_SOURCES+=resources.rc setup.exe.manifest
 endif