ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-18 20:47:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix config spacing and path to xgcc

Browse Source
This commit is contained in:
Trammell hudson 2018-09-18 16:04:28 -04:00
parent 9ab033aa06
commit 6183d58ecc
Failed to extract signature
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.circleci/config.yml
View File

@ -42,7 +42,7 @@ jobs:
name: Bootstrap coreboot-gcc
command: |
./build/make-4.2.1/make \
TOOLCHAIN=/home/builder/heads \
TOOLCHAIN=/home/builder/heads \
V=1 \
BOARD=qemu-coreboot \
coreboot-gcc
@ -52,7 +52,7 @@ jobs:
name: qemu-coreboot
command: |
./build/make-4.2.1/make \
TOOLCHAIN=/home/builder/heads \
TOOLCHAIN=/home/builder/heads \
V=1 \
-j4 \
BOARD=qemu-coreboot \
@ -67,9 +67,9 @@ jobs:
name: qemu-linuxboot
command: |
./build/make-4.2.1/make \
TOOLCHAIN=/home/builder/heads \
TOOLCHAIN=/home/builder/heads \
V=1 \
-j4 \
-j4 \
BOARD=qemu-linuxboot \
- store-artifacts:
@ -82,7 +82,7 @@ jobs:
name: x230
command: |
./build/make-4.2.1/make \
TOOLCHAIN=/home/builder/heads \
TOOLCHAIN=/home/builder/heads \
-j4 \
V=1 \
BOARD=x230 \

4
modules/coreboot
View File

@ -56,13 +56,13 @@ $(COREBOOT_XGCC): $(build)/$(coreboot_base_dir)/.canary
else
# Use the pre-build one from the external toolchain build
$(COREBOOT_XGCC):
if [ ! -e "$(TOOLCHAIN)/$(COREBOOT_XGCC_REL)" ]; then \
if [ ! -e "$(TOOLCHAIN)/build/$(COREBOOT_XGCC_REL)" ]; then \
echo >&2 "ERROR: TOOLCHAIN=$(TOOLCHAIN) does not have coreboot" ; \
exit 1 ; \
fi
if [ ! -e "$(COREBOOT_XGCC_PATH)" ]; then \
ln -s \
"$(TOOLCHAIN)/build/$(coreboot_base_dir)/util/crossgcc/xgcc" \
"$(TOOLCHAIN)/build/$(COREBOOT_XGCC_REL)" \
"$(COREBOOT_XGCC_PATH)" ; \
fi
endif