diff options
| author | Doug Anderson <dianders@chromium.org> | 2012-05-11 11:47:02 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-05-11 12:44:53 -0700 |
| commit | 6fa4e9f77c1c9d92c945d2d771c81f10246cf9b7 (patch) | |
| tree | ca2d5383d56383881c99a077df312151a789206b | |
| parent | 317e25c663162bf24453c2916c07ce2c7d2a2da3 (diff) | |
| download | vboot-6fa4e9f77c1c9d92c945d2d771c81f10246cf9b7.tar.gz | |
Fix build errors with .c and .cc files being in the libcgpt-cc.a
When I build without this fix, I get errors like this:
armv7a-cros-linux-gnueabi-strip:....libcgpt-cc.a(CgptManager.cc):
Unable to recognise the format of file: File format not recognized
The .a file shouldn't have .cc files in it anyway.
The error appears to have been introduced in:
https://gerrit.chromium.org/gerrit/16433
I'm not sure why it wasn't noticed until now, but perhaps the
new toolchain is just pickier.
BUG=None
TEST=emerge-daisy vboot_reference works
TEST=With future hardfp change, can boot U-Boot compiled with new
toolchain.
Change-Id: I33f15fb38d7e236000845d0a864c1e86469f32c7
Reviewed-on: https://gerrit.chromium.org/gerrit/22476
Tested-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Doug Anderson <dianders@chromium.org>
| -rw-r--r-- | cgpt/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cgpt/Makefile b/cgpt/Makefile index dc345215..ae9aac1c 100644 --- a/cgpt/Makefile +++ b/cgpt/Makefile @@ -49,7 +49,9 @@ main: $(PROGNAME) include ../common.mk -LIB_CGPT_CC_OBJS = $(LIB_CGPT_CC_SRCS:%.c=${BUILD_ROOT}/%.o) $(LIB_CGPT_CC_SRCS:%.cc=${BUILD_ROOT}/%.o) +LIB_CGPT_CC_OBJS = $(filter %.o, \ + $(LIB_CGPT_CC_SRCS:%.c=${BUILD_ROOT}/%.o) \ + $(LIB_CGPT_CC_SRCS:%.cc=${BUILD_ROOT}/%.o)) LIB_CGPT_CC_DEPS = $(LIB_CGPT_CC_OBJS:%.o=%.o.d) libcgpt_cc: $(LIB_CGPT_CC) @@ -67,4 +69,3 @@ install: $(PROGNAME) chmod a+rx $(patsubst ${BUILD_ROOT}/%,$(DESTDIR)/%,$^) .PHONY: all install - |