diff options
author | Matthew McClintock <msm@freescale.com> | 2012-07-26 11:21:43 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-21 11:16:44 +0100 |
commit | 6352d0a9a1a1133d840df6c6679651cb714ad4c8 (patch) | |
tree | 2c8e1e2889a49f655cda9f45c009a8963c7bb22f /meta/recipes-bsp | |
parent | 0a6f9a5f5a584422d24b19fd323bdec711dde3d5 (diff) | |
download | poky-6352d0a9a1a1133d840df6c6679651cb714ad4c8.tar.gz |
u-boot.inc: update linker arguments to pass --sysroot arg
If we are building from sstate-cache it's possible to be building
from another folder on another machine, therefore the linker requires
that a proper --sysroot is passed too it so it can find things like
libgcc.a and avoid errors such as:
| arm-poky-linux-gnueabi-gcc -g -O2 -fno-common -ffixed-r8 -msoft-float -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0x80008000 -I/local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/work/beagleboard-poky-linux-gnueabi/u-boot-v2011.06+git5+b1af6f532e0d348b153d5c148369229d24af361a-r0/git/include -fno-builtin -ffreestanding -nostdinc -isystem /local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/sysroots/x86_64-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/../../lib/armv7a-vfp-neon-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/4.6.3/include -pipe -DCONFIG_ARM -D__ARM__ -marm -mabi=aapcs-linux -mno-thumb-interwork -march=armv5 -Wall -Wstrict-prototypes -fno-stack-protector -fno-toplevel-reorder -o hello_world.o hello_world.c -c
| arm-poky-linux-gnueabi-gcc -g -O2 -fno-common -ffixed-r8 -msoft-float -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0x80008000 -I/local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/work/beagleboard-poky-linux-gnueabi/u-boot-v2011.06+git5+b1af6f532e0d348b153d5c148369229d24af361a-r0/git/include -fno-builtin -ffreestanding -nostdinc -isystem /local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/sysroots/x86_64-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/../../lib/armv7a-vfp-neon-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/4.6.3/include -pipe -DCONFIG_ARM -D__ARM__ -marm -mabi=aapcs-linux -mno-thumb-interwork -march=armv5 -Wall -Wstrict-prototypes -fno-stack-protector -fno-toplevel-reorder -o stubs.o stubs.c -c
| arm-poky-linux-gnueabi-ld -r -o libstubs.o stubs.o
| arm-poky-linux-gnueabi-ld -g -Ttext 0x80300000 \
| -o hello_world -e hello_world hello_world.o libstubs.o \
| -L. -lgcc
| arm-poky-linux-gnueabi-ld: cannot find -lgcc
| make[1]: *** [hello_world] Error 1
(From OE-Core rev: ad78441045183277a7e77341f4af6d9d65a4a3c8)
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot.inc | 2 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot_2011.03.bb | 2 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot_2011.06.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 0445c343d3..e627e978c8 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc | |||
@@ -8,7 +8,7 @@ inherit deploy | |||
8 | PARALLEL_MAKE="" | 8 | PARALLEL_MAKE="" |
9 | 9 | ||
10 | # GCC 4.5.1 builds unusable binaries using -Os, remove it from OPTFLAGS | 10 | # GCC 4.5.1 builds unusable binaries using -Os, remove it from OPTFLAGS |
11 | EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} OPTFLAGS='-O2'" | 11 | EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} OPTFLAGS='-O2' CC='${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}'" |
12 | 12 | ||
13 | python () { | 13 | python () { |
14 | if not d.getVar("UBOOT_MACHINE", True): | 14 | if not d.getVar("UBOOT_MACHINE", True): |
diff --git a/meta/recipes-bsp/u-boot/u-boot_2011.03.bb b/meta/recipes-bsp/u-boot/u-boot_2011.03.bb index e99bc2cab4..5d79e1a0ab 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2011.03.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2011.03.bb | |||
@@ -17,7 +17,7 @@ FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}" | |||
17 | SRCREV = "19b54a701811220221fc4d5089a2bb18892018ca" | 17 | SRCREV = "19b54a701811220221fc4d5089a2bb18892018ca" |
18 | 18 | ||
19 | PV = "v2011.03+git${SRCPV}" | 19 | PV = "v2011.03+git${SRCPV}" |
20 | PR = "r6" | 20 | PR = "r7" |
21 | 21 | ||
22 | SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" | 22 | SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" |
23 | 23 | ||
diff --git a/meta/recipes-bsp/u-boot/u-boot_2011.06.bb b/meta/recipes-bsp/u-boot/u-boot_2011.06.bb index 680401f45b..43f2c0661b 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2011.06.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2011.06.bb | |||
@@ -17,7 +17,7 @@ FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}" | |||
17 | SRCREV = "b1af6f532e0d348b153d5c148369229d24af361a" | 17 | SRCREV = "b1af6f532e0d348b153d5c148369229d24af361a" |
18 | 18 | ||
19 | PV = "v2011.06+git${SRCPV}" | 19 | PV = "v2011.06+git${SRCPV}" |
20 | PR = "r1" | 20 | PR = "r2" |
21 | 21 | ||
22 | SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" | 22 | SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" |
23 | 23 | ||