diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2018-03-22 09:08:16 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-03-22 09:08:16 +0100 |
| commit | ddeadb29e95b916bf95d7a50d0aad939cbba6249 (patch) | |
| tree | 9226439dce07c733acc090bf0b441d55edc4a1e1 | |
| parent | e01a788530f1eaefa64ccd1ba58a10ec13ea844d (diff) | |
| download | coreboot-ddeadb29e95b916bf95d7a50d0aad939cbba6249.tar.gz | |
toolchain tweaks
| -rw-r--r-- | config.i440fx.seabios | 3 | ||||
| -rw-r--r-- | config.i440fx.seabios.corevga | 3 | ||||
| -rw-r--r-- | config.i440fx.tianocore | 3 | ||||
| -rw-r--r-- | config.q35.seabios | 3 | ||||
| -rw-r--r-- | config.q35.tianocore | 3 | ||||
| -rw-r--r-- | coreboot.git.spec | 8 |
6 files changed, 15 insertions, 8 deletions
diff --git a/config.i440fx.seabios b/config.i440fx.seabios index 6ccf243..af717d6 100644 --- a/config.i440fx.seabios +++ b/config.i440fx.seabios @@ -1,4 +1,5 @@ -#CONFIG_ANY_TOOLCHAIN=y +CONFIG_EXPERT=y +CONFIG_ANY_TOOLCHAIN=y CONFIG_VENDOR_EMULATION=y CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y CONFIG_COREBOOT_ROMSIZE_KB_4096=y diff --git a/config.i440fx.seabios.corevga b/config.i440fx.seabios.corevga index c0eee24..53c0d07 100644 --- a/config.i440fx.seabios.corevga +++ b/config.i440fx.seabios.corevga @@ -1,4 +1,5 @@ -#CONFIG_ANY_TOOLCHAIN=y +CONFIG_EXPERT=y +CONFIG_ANY_TOOLCHAIN=y CONFIG_VENDOR_EMULATION=y CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y CONFIG_COREBOOT_ROMSIZE_KB_4096=y diff --git a/config.i440fx.tianocore b/config.i440fx.tianocore index 623235e..d202c69 100644 --- a/config.i440fx.tianocore +++ b/config.i440fx.tianocore @@ -1,4 +1,5 @@ -#CONFIG_ANY_TOOLCHAIN=y +CONFIG_EXPERT=y +CONFIG_ANY_TOOLCHAIN=y CONFIG_VENDOR_EMULATION=y CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y CONFIG_COREBOOT_ROMSIZE_KB_4096=y diff --git a/config.q35.seabios b/config.q35.seabios index 8b3dee4..bdda29c 100644 --- a/config.q35.seabios +++ b/config.q35.seabios @@ -1,4 +1,5 @@ -#CONFIG_ANY_TOOLCHAIN=y +CONFIG_EXPERT=y +CONFIG_ANY_TOOLCHAIN=y CONFIG_VENDOR_EMULATION=y CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y CONFIG_COREBOOT_ROMSIZE_KB_4096=y diff --git a/config.q35.tianocore b/config.q35.tianocore index 71d56a4..4cd8964 100644 --- a/config.q35.tianocore +++ b/config.q35.tianocore @@ -1,4 +1,5 @@ -#CONFIG_ANY_TOOLCHAIN=y +CONFIG_EXPERT=y +CONFIG_ANY_TOOLCHAIN=y CONFIG_VENDOR_EMULATION=y CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y CONFIG_COREBOOT_ROMSIZE_KB_4096=y diff --git a/coreboot.git.spec b/coreboot.git.spec index b879f88..a37c3b7 100644 --- a/coreboot.git.spec +++ b/coreboot.git.spec @@ -52,9 +52,11 @@ function do_build() { mkdir rpm.doc mkdir rpm.bin -# pick up coreboot toolchain in /usr/local/bin -PATH="/usr/local/bin:$PATH" -unset CC +# use newer gcc on rhel, log used version +if test -f /opt/rh/devtoolset-6/enable; then + source /opt/rh/devtoolset-6/enable +fi +gcc --version do_build %{SOURCE10} coreboot-i440fx-seabios do_build %{SOURCE11} coreboot-i440fx-seabios-corevga |