diff options
| author | zbao <fishbaozi@gmail.com> | 2015-09-11 08:49:38 -0400 |
|---|---|---|
| committer | Zheng Bao <zheng.bao@amd.com> | 2015-09-29 02:51:38 +0000 |
| commit | 46a7c82bcf9418bc12972eb1c54d19c9a98a9e2b (patch) | |
| tree | 184138e3a8f9a2f64dddc50ce9aba7931f90daac /src/arch | |
| parent | bebef2133eb842603b207c4e324f1bac7183757f (diff) | |
| download | coreboot-46a7c82bcf9418bc12972eb1c54d19c9a98a9e2b.tar.xz | |
Makefile: Replace the way to test if a string is empty
The output of command below,
# i386-elf-nm build/cbfs/fallback/romstage_null.offenders | \
grep -q "" ; echo $?
has different result on MacOS, OS X Mavericks, which outputs 0.
On linux, it outputs 1.
I assume it is misleading to search an empty string in a empty
string. Change it to testing if the string is empty.
Change-Id: Ie4b8fe1fb26df092e2985937251a49feadc61eb0
Signed-off-by: Zheng Bao <zheng.bao@amd.com>
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Reviewed-on: http://review.coreboot.org/11600
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/x86/Makefile.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 79b82e077d..1779099b68 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -190,7 +190,7 @@ $(objcbfs)/romstage.debug: $$(romstage-objs) $$(romstage-libs) $(LD_romstage) $(LDFLAGS_romstage) -o $@ -L$(obj) $(COMPILER_RT_FLAGS_romstage) --whole-archive --start-group $(filter-out %.ld,$(romstage-objs)) $(romstage-libs) --no-whole-archive $(COMPILER_RT_romstage) --end-group -T $(obj)/arch/x86/memlayout.romstage.ld --oformat $(romstage-oformat) LANG=C LC_ALL= $(OBJCOPY_romstage) --only-section .illegal_globals $(@) $(objcbfs)/romstage_null.offenders 2>&1 | \ grep -v "Empty loadable segment detected" && \ - $(NM_romstage) $(objcbfs)/romstage_null.offenders | grep -q ""; if [ $$? -eq 0 ]; then \ + if [ -n "`$(NM_romstage) $(objcbfs)/romstage_null.offenders 2>/dev/null`" ]; then \ echo "Forbidden global variables in romstage:"; \ $(NM_romstage) $(objcbfs)/romstage_null.offenders; false; \ else true; fi |