1--- ./lib/Makefile 2014-11-18 08:16:19.000000000 -0800
2+++ ./lib/Makefile 2015-05-23 14:48:31.000000000 -0700
3@@ -6,12 +6,12 @@
4 all: libre2_stubs.a dllre2_stubs.so
5
6 dllre2_stubs.so libre2_stubs.a: stubs.o $(LIBRE2)
7- ocamlmklib -oc re2_stubs stubs.o $(LIBRE2) -lstdc++
8+ ocamlmklib -oc re2_stubs stubs.o $(LIBRE2) -lc++
9 rm libre2_stubs.a # ocamlmklib just includes $(LIBRE2) inside the stubs archive
10 cp $(LIBRE2) libre2_stubs.a && ar r libre2_stubs.a stubs.o
11
12 stubs.o: stubs.cpp stubs.h util.h enum_x_macro.h
13- g++ -O2 -DPIC -fPIC -g -pipe -DCAML_NAME_SPACE -Wall -I. -I../../../include \
14+ $(CXX) -O2 -DPIC -fPIC -g -pipe -DCAML_NAME_SPACE -Wall -I. -I../../../include \
15 -I$(RE2_HOME) -I$(ocaml-version-selected-include-path) -c stubs.cpp
16
17 #stubs.o: %.o: %.cpp %.h