diff -r 2b9f54d14cc2 -r 066e557ac453 pre-inst/Makefile.am
--- a/pre-inst/Makefile.am	Sat Nov 15 19:04:45 2014 +0000
+++ b/pre-inst/Makefile.am	Fri Apr 15 13:05:48 2016 +0100
@@ -9,11 +9,13 @@
 AM_LDFLAGS=-mwindows
 endif
 INCLUDES=-I$(top_srcdir) -I$(srcdir)
+CCLD = $(CXX)
 
 bin_PROGRAMS=pre-inst
 
 pre_inst_SOURCES=pre-inst.c
 pre_inst_LDFLAGS=$(AM_LDFLAGS) -all-static
+pre_inst_LIBTOOLFLAGS=--tag=CXX
 if HAVE_WINDRES
 pre_inst_SOURCES+=resources.rc pre-inst.exe.manifest resource.h
 endif