Subzero: Improve "make check-unit" execution.

If you switch between "cmake" and "autoconf" toolchain builds, and neglect to clean out pnacl_newlib_raw/ in between, the wrong libgtest and libgtest_main may get pulled in for the autoconf build, leading to an assertion failure in "make check-unit". This tweak fixes that problem by rejiggering the lib search path. BUG= none R=jvoung@chromium.org Review URL: https://codereview.chromium.org/1099093005

Subzero: Improve "make check-unit" execution.
e7e9b024 · Jim Stichnoth · 0a9e1261 · e7e9b024
Commit e7e9b024 authored Apr 21, 2015 by Jim Stichnoth
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Makefile.standalone Makefile.standalone +2 -2

No files found.
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -248,8 +248,8 @@ $(SB_OBJS): $(SB_OBJDIR)/%.o: src/%.cpp src/*.h src/*.def
 	$(SB_CXX) -c $(SB_CXXFLAGS) $< -o $@

 $(OBJDIR)/run_unittests: $(UNITTEST_OBJS) $(UNITTEST_LIB_OBJS)
-	$(CXX) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) \
-               $(GTEST_LIB_PATH) -lgtest -lgtest_main -ldl \
+	$(CXX) $(GTEST_LIB_PATH) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) \
+               -lgtest -lgtest_main -ldl \
               -Wl,-rpath=$(abspath $(LIBCXX_INSTALL_PATH)/lib)

 $(UNITTEST_OBJS): $(OBJDIR)/unittest/%.o: unittest/%.cpp \