Minor build fixes.

I made these two tiny changes to SeaBIOS when I was playing with the
HEAD version.

The Makefile change prevents the test command from failing if CC
contains a space.

The coreboot change prevents a warning on our gcc 4.5.2 in certain
circumstances when sizeof seems to be unsigned long int instead of
unsigned int.

They're both unintrusive, shouldn't have potential for breaking
anything.

Signed-off-by: Stefan Reinauer <stepan@coreboot.org>

diff --git a/Makefile b/Makefile
index acc238586d259c8e9fd82ed3fe07c5f5366da328..384bf79043aad23a2d93ce340b58a0d3e8cefd2d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ vpath %.S src vgasrc
 ################ Build rules
 
 # Verify the gcc configuration and test if -fwhole-program works.
-TESTGCC:=$(shell CC=$(CC) tools/test-gcc.sh)
+TESTGCC:=$(shell CC="$(CC)" tools/test-gcc.sh)
 ifeq "$(TESTGCC)" "-1"
 $(error "Please upgrade GCC")
 endif

diff --git a/src/coreboot.c b/src/coreboot.c
index 50d300c8dabd2251c4784bcfcc6f67c6d004a973..cdbf33726660be2136602b26da5a0f50e6c6f9c8 100644 (file)
--- a/src/coreboot.c
+++ b/src/coreboot.c
@@ -320,7 +320,7 @@ ulzma(u8 *dst, u32 maxlen, const u8 *src, u32 srclen)
     u8 scratch[15980];
     int need = (LzmaGetNumProbs(&state.Properties) * sizeof(CProb));
     if (need > sizeof(scratch)) {
-        dprintf(1, "LzmaDecode need %d have %d\n", need, sizeof(scratch));
+        dprintf(1, "LzmaDecode need %d have %d\n", need, (unsigned int)sizeof(scratch));
         return -1;
     }
     state.Probs = (CProb *)scratch;