Permalink
Browse files

Hack to make the RE2 tests compile for me

Probably should rethink how those work somehow...
  • Loading branch information...
1 parent cea01e5 commit 956c00c8876d986107a544d5e282bd9378b01af7 @dgl committed Apr 1, 2012
Showing with 4 additions and 5 deletions.
  1. +4 −5 Makefile.PL
View
@@ -68,9 +68,8 @@ if(defined $Config{usethreads} && $Config{usethreads} eq 'define') {
if(defined $Config{i_pthread} && $Config{i_pthread} eq 'define') {
$opt{DEFINE} = "-DHAVE_PTHREAD -pthread";
} else {
- # For now this allows compilation under Win32/Strawberry
- # I'm not sure Perl needs thread safety from RE2 anyway as normally SVs
- # aren't shared but they might be..., needs some thought.
+ # For now this allows compilation under Win32/Strawberry, but might cause weird crashes on thread
+ # destruction...
$opt{DEFINE} = "-DNO_THREADS";
}
} else {
@@ -117,7 +116,7 @@ re2/obj/libre2.a: re2/Makefile
$MAKE -C re2 obj/libre2.a \$(RE2_FLAGS)
re2-tests:
- $MAKE -C re2 static-test \$(RE2_FLAGS)
-
+ $MAKE -C re2 static-test \$(RE2_FLAGS) LDFLAGS="\$(OTHERLDFLAGS) \$(LDLOADLIBS) -lm -lpthread"
+
MAKE_FRAG
}

0 comments on commit 956c00c

Please sign in to comment.