Issue 6783006: Fix duplicate -I's harmless under gcc but which break bunny-gcc

Issue 6783006: Fix duplicate -I's harmless under gcc but which break bunny-gcc (Closed)

Created:
9 years, 8 months ago by jimhebert

Modified:
9 years, 7 months ago

Reviewers:
gauravsh, Bill Richardson

CC:
chromium-os-reviews_chromium.org, Randall Spangler, gauravsh, Luigi Semenzato, Bill Richardson

Base URL:
ssh://git@gitrw.chromium.org:9222/vboot_reference.git@master

Visibility:
Public.

Description

Fix duplicate -I's harmless under gcc but which break bunny-gcc (This helps us do some instrumented fuzz testing with "bunny the fuzzer".) Change-Id: I4d06129d577115b9dd5cd9bec2c2e1b526490456 BUG=chromium-os:13690 TEST="CC=/usr/local/google/bunny-0.93/bunny-gcc make -k" now builds vbutil_*, and regular gcc/make did not break. STATUS=Fixed Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=e871ea6

Patch Set 1 #

Created: 9 years, 8 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+17 lines, -17 lines)			Patch
	M	utility/Makefile	View		3 chunks	+17 lines, -17 lines	0 comments	Download

Messages

Total messages: 4 (0 generated)

Expand Messages | Collapse Messages

gauravsh

Can you.make sure this doesn't break 1) standalone compilation (make) 2) compilation under the chroot ...

9 years, 8 months ago (2011-03-31 03:03:29 UTC) #2

Can you.make sure this doesn't break

1) standalone compilation (make)
2) compilation under the chroot

emerge vboot_reference
emerge-x86-generuc vboot...
and
emerge-arm-generic vboot...
On Mar 30, 2011 6:03 PM, <jimhebert@chromium.org> wrote:
> Reviewers: gauravsh, Bill Richardson,
>
> Description:
> Fix duplicate -I's harmless under gcc but which break bunny-gcc
>
> (This helps us do some instrumented fuzz testing with "bunny the fuzzer".)
>
> Change-Id: I4d06129d577115b9dd5cd9bec2c2e1b526490456
>
> BUG=chromium-os:13690
> TEST="CC=/usr/local/google/bunny-0.93/bunny-gcc make -k" now builds
> vbutil_*,
> and regular gcc/make did not break.
> STATUS=Fixed
>
> Please review this at http://codereview.chromium.org/6783006/
>
> SVN Base: ssh://git@gitrw.chromium.org:9222/vboot_reference.git@master
>
> Affected files:
> M utility/Makefile
>
>
> Index: utility/Makefile
> diff --git a/utility/Makefile b/utility/Makefile
> index
>
6cf19c0a34ca397dc4fc9d6b623b255f7fb43d1e..fbbd0658cd9b615674b81bd99c098524e38459da

> 100644
> --- a/utility/Makefile
> +++ b/utility/Makefile
> @@ -49,13 +49,13 @@ ALL_DEPS = $(addsuffix .d,${TARGET_BINS})
> all: $(TARGET_BINS)
>
> ${BUILD_ROOT}/crossystem: crossystem_main.c $(LIBS)
> - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS)
> + $(CC) $(CFLAGS) $< -o $@ $(LIBS)
>
> ${BUILD_ROOT}/dumpRSAPublicKey: dumpRSAPublicKey.c
> - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ -lcrypto
> + $(CC) $(CFLAGS) $< -o $@ -lcrypto
>
> ${BUILD_ROOT}/dump_kernel_config: dump_kernel_config.c $(LIBS)
> - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
>
> ${BUILD_ROOT}/gbb_utility: gbb_utility.cc
> $(CXX) -DWITH_UTIL_MAIN $(CFLAGS) $< -o $@
> @@ -79,40 +79,40 @@ ${BUILD_ROOT}/bmpblk_utility:
> ${BUILD_ROOT}/bmpblk_utility.o \
> $(CXX) -llzma -lyaml $(CFLAGS) $^ -o $@
>
> ${BUILD_ROOT}/load_firmware_test: load_firmware_test.c $(LIBS)
> - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
>
> ${BUILD_ROOT}/load_kernel_test: load_kernel_test.c $(LIBS)
> - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
>
> ${BUILD_ROOT}/pad_digest_utility: pad_digest_utility.c $(LIBS)
> - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
>
> ${BUILD_ROOT}/signature_digest_utility: signature_digest_utility.c $(LIBS)
> - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
>
> ${BUILD_ROOT}/tlcl_generator: tlcl_generator.c
> - $(HOSTCC) $(CFLAGS) $(INCLUDES) -fpack-struct $< -o $@
> + $(HOSTCC) $(CFLAGS) -fpack-struct $< -o $@
>
> ${BUILD_ROOT}/vbutil_firmware: vbutil_firmware.c $(LIBS)
> - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
>
> ${BUILD_ROOT}/vbutil_kernel: vbutil_kernel.c $(LIBS)
> - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
>
> ${BUILD_ROOT}/vbutil_key: vbutil_key.c $(LIBS)
> - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
>
> ${BUILD_ROOT}/vbutil_keyblock: vbutil_keyblock.c $(LIBS)
> - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
>
> ${BUILD_ROOT}/verify_data: verify_data.c $(LIBS)
> - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
>
> ${BUILD_ROOT}/sign_image: sign_image.c $(LIBS)
> - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
>
> ${BUILD_ROOT}/tpm_init_temp_fix: tpm_init_temp_fix.c $(LIBS)
> - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS)
> + $(CC) $(CFLAGS) $< -o $@ $(LIBS)
>
> ${BUILD_ROOT}/tpm_set_readsrkpub: tpm_set_readsrkpub.c
> $(CC) $(CFLAGS) $< -o $@ -ltspi
> @@ -126,10 +126,10 @@ ${BUILD_ROOT}/dev_debug_vboot: dev_debug_vboot
> chmod +x $@
>
> ${BUILD_ROOT}/tpmc: tpmc.c $(LIBS)
> - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS)
> + $(CC) $(CFLAGS) $< -o $@ $(LIBS)
>
> ${BUILD_ROOT}/dev_sign_file: dev_sign_file.c $(LIBS)
> - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
>
> ${BUILD_ROOT}/dump_fmap: dump_fmap.c $(LIBS)
> $(CC) $(CFLAGS) $< -o $@ $(LIBS)
>
>

jimhebert

On 2011/03/31 03:03:29, gauravsh wrote: > Can you.make sure this doesn't break > > 1) ...

9 years, 8 months ago (2011-03-31 23:24:21 UTC) #3

On 2011/03/31 03:03:29, gauravsh wrote:
> Can you.make sure this doesn't break
> 
> 1) standalone compilation (make)
> 2) compilation under the chroot
> 
> emerge vboot_reference
> emerge-x86-generuc vboot...
> and
> emerge-arm-generic vboot...

Done. All 4 cases still work. LGTY? :)


> On Mar 30, 2011 6:03 PM, <mailto:jimhebert@chromium.org> wrote:
> > Reviewers: gauravsh, Bill Richardson,
> >
> > Description:
> > Fix duplicate -I's harmless under gcc but which break bunny-gcc
> >
> > (This helps us do some instrumented fuzz testing with "bunny the fuzzer".)
> >
> > Change-Id: I4d06129d577115b9dd5cd9bec2c2e1b526490456
> >
> > BUG=chromium-os:13690
> > TEST="CC=/usr/local/google/bunny-0.93/bunny-gcc make -k" now builds
> > vbutil_*,
> > and regular gcc/make did not break.
> > STATUS=Fixed
> >
> > Please review this at http://codereview.chromium.org/6783006/
> >
> > SVN Base: ssh://git@gitrw.chromium.org:9222/vboot_reference.git@master
> >
> > Affected files:
> > M utility/Makefile
> >
> >
> > Index: utility/Makefile
> > diff --git a/utility/Makefile b/utility/Makefile
> > index
> >
>
6cf19c0a34ca397dc4fc9d6b623b255f7fb43d1e..fbbd0658cd9b615674b81bd99c098524e38459da
> 
> > 100644
> > --- a/utility/Makefile
> > +++ b/utility/Makefile
> > @@ -49,13 +49,13 @@ ALL_DEPS = $(addsuffix .d,${TARGET_BINS})
> > all: $(TARGET_BINS)
> >
> > ${BUILD_ROOT}/crossystem: crossystem_main.c $(LIBS)
> > - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS)
> > + $(CC) $(CFLAGS) $< -o $@ $(LIBS)
> >
> > ${BUILD_ROOT}/dumpRSAPublicKey: dumpRSAPublicKey.c
> > - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ -lcrypto
> > + $(CC) $(CFLAGS) $< -o $@ -lcrypto
> >
> > ${BUILD_ROOT}/dump_kernel_config: dump_kernel_config.c $(LIBS)
> > - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> > + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
> >
> > ${BUILD_ROOT}/gbb_utility: gbb_utility.cc
> > $(CXX) -DWITH_UTIL_MAIN $(CFLAGS) $< -o $@
> > @@ -79,40 +79,40 @@ ${BUILD_ROOT}/bmpblk_utility:
> > ${BUILD_ROOT}/bmpblk_utility.o \
> > $(CXX) -llzma -lyaml $(CFLAGS) $^ -o $@
> >
> > ${BUILD_ROOT}/load_firmware_test: load_firmware_test.c $(LIBS)
> > - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> > + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
> >
> > ${BUILD_ROOT}/load_kernel_test: load_kernel_test.c $(LIBS)
> > - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> > + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
> >
> > ${BUILD_ROOT}/pad_digest_utility: pad_digest_utility.c $(LIBS)
> > - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> > + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
> >
> > ${BUILD_ROOT}/signature_digest_utility: signature_digest_utility.c $(LIBS)
> > - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> > + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
> >
> > ${BUILD_ROOT}/tlcl_generator: tlcl_generator.c
> > - $(HOSTCC) $(CFLAGS) $(INCLUDES) -fpack-struct $< -o $@
> > + $(HOSTCC) $(CFLAGS) -fpack-struct $< -o $@
> >
> > ${BUILD_ROOT}/vbutil_firmware: vbutil_firmware.c $(LIBS)
> > - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> > + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
> >
> > ${BUILD_ROOT}/vbutil_kernel: vbutil_kernel.c $(LIBS)
> > - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> > + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
> >
> > ${BUILD_ROOT}/vbutil_key: vbutil_key.c $(LIBS)
> > - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> > + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
> >
> > ${BUILD_ROOT}/vbutil_keyblock: vbutil_keyblock.c $(LIBS)
> > - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> > + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
> >
> > ${BUILD_ROOT}/verify_data: verify_data.c $(LIBS)
> > - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> > + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
> >
> > ${BUILD_ROOT}/sign_image: sign_image.c $(LIBS)
> > - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> > + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
> >
> > ${BUILD_ROOT}/tpm_init_temp_fix: tpm_init_temp_fix.c $(LIBS)
> > - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS)
> > + $(CC) $(CFLAGS) $< -o $@ $(LIBS)
> >
> > ${BUILD_ROOT}/tpm_set_readsrkpub: tpm_set_readsrkpub.c
> > $(CC) $(CFLAGS) $< -o $@ -ltspi
> > @@ -126,10 +126,10 @@ ${BUILD_ROOT}/dev_debug_vboot: dev_debug_vboot
> > chmod +x $@
> >
> > ${BUILD_ROOT}/tpmc: tpmc.c $(LIBS)
> > - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS)
> > + $(CC) $(CFLAGS) $< -o $@ $(LIBS)
> >
> > ${BUILD_ROOT}/dev_sign_file: dev_sign_file.c $(LIBS)
> > - $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
> > + $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
> >
> > ${BUILD_ROOT}/dump_fmap: dump_fmap.c $(LIBS)
> > $(CC) $(CFLAGS) $< -o $@ $(LIBS)
> >
> >

lgtm

Expand Messages | Collapse Messages