diff options
-rw-r--r-- | conf/distro/angstrom-2008.1.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/angstrom-uclibc.inc | 2 | ||||
-rw-r--r-- | conf/distro/include/angstrom.inc | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 0e1f39a7a6..cf6bc9f882 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -79,7 +79,7 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" #KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)" #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against -PREFERRED_VERSION_linux-libc-headers = "2.6.31" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.31" #Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing. PREFERRED_VERSION_glibc ?= "2.9" diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 004d90434c..e49d078458 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -27,7 +27,7 @@ BUILD_OPTIMIZATION = "-O2 -ggdb3" #Note that this testing was done without the gcc-pr32889.patch. FULL_OPTIMIZATION_avr32 = "-Os -fomit-frame-pointer" -TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'avr32']]}" +TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'avr32', 'nios2']]}" CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 669c8ada3c..4f51589c46 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -10,6 +10,7 @@ DISTRO_NAME = "Angstrom" BUILDNAME = "Angstrom ${DISTRO_VERSION}" TARGET_VENDOR = "-angstrom" +TARGET_VENDOR_nios2 = "" # Add FEED_ARCH to overrides OVERRIDES .= ":${FEED_ARCH}" |