commit 8e05e0de29e20e5d3b19acc37eb3a947ccb4eff4
author Albert Chaulk <achaulk@chromium.org> Tue Oct 22 20:25:30 2013
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Oct 23 04:09:20 2013
tree 5cb5f867d8381ad2d777b9e2a0f32e0bc80a1189
parent eff0a3018acbe864ba94df73efbe3747121b373f

Fix arm build

BUG=chromium:304400
TEST=cros_run_unit_tests --board daisy-drm

Change-Id: I5fab26676557291bf12fbc4ad6b400b4ea67fd30
Reviewed-on: https://chromium-review.googlesource.com/174083
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Albert Chaulk <achaulk@chromium.org>
Tested-by: Albert Chaulk <achaulk@chromium.org>

Makefile

diff --git a/Makefile b/Makefile
index 2d7bac1..2026972 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,8 @@
 COMMAND_LDFLAGS = $(LDFLAGS)
 
 TEST_OBJS = log_unit_tests.o
-TEST_LDFLAGS = $(LDFLAGS) -lgtest
+TEST_LDFLAGS = $(LDFLAGS)
+TEST_LDLIBS = -lgtest
 
 OBJS = $(LIB_OBJS) $(TEST_OBJS) $(COMMAND_OBJS)
 
@@ -44,7 +45,7 @@
 	$(AR) rcs $@ $^
 
 $(TEST): $(TEST_OBJS) $(LIB)
-	$(CXX) $(TEST_LDFLAGS) -o $@ $^
+	$(CXX) $(TEST_LDFLAGS) -o $@ $^ $(TEST_LDLIBS)
 
 clean:
 	rm -f $(COMMAND) $(LIB) $(OBJS) $(TEST)