Subzero: Fix new issues after the LLVM 3.5 merge.
We need to link with -lpthread now.
The CALLTARGETS workaround in our lit tests can be removed, since llvm-objdump has gotten more accurate than before with respect to symbols.
The -stats and -rng-seed options need to be renamed to avoid conflicting with the LLVM options being brought in.
BUG= https://code.google.com/p/nativeclient/issues/detail?id=3930
R=jvoung@chromium.org
Review URL: https://codereview.chromium.org/756543002
diff --git a/Makefile.standalone b/Makefile.standalone
index b6e7eb6..d6a2daf 100644
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -74,7 +74,8 @@
LLVM_CXXFLAGS := `$(LLVM_BIN_PATH)/llvm-config --cxxflags`
LLVM_LDFLAGS := `$(LLVM_BIN_PATH)/llvm-config --libs` \
- `$(LLVM_BIN_PATH)/llvm-config --ldflags`
+ `$(LLVM_BIN_PATH)/llvm-config --ldflags` \
+ `$(LLVM_BIN_PATH)/llvm-config --system-libs`
# It's recommended that CXX matches the compiler you used to build LLVM itself.
CCACHE := `command -v ccache`
@@ -133,7 +134,7 @@
# TODO(kschimpf): Fix python scripts to directly get build attributes
# rather than generating $(OBJDIR)/llvm2ice.build_atts.
$(OBJDIR)/llvm2ice: $(OBJS)
- $(CXX) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) -ldl \
+ $(CXX) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) \
-Wl,-rpath=$(abspath $(LIBCXX_INSTALL_PATH)/lib)
# TODO: Be more precise than "*.h" here and elsewhere.
