Mercurial > hg > aboriginal

changeset 838:3cd64af0d1b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging the branch between landley and mirell
author Mark Miller <mark@mirell.org>
date Tue, 06 Oct 2009 17:57:23 -0500
parents f80c47e8991d (diff) f448815e20b0 (current diff)
children 1067e99efbdc
files root-filesystem.sh
diffstat 3 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/config	Tue Oct 06 08:58:56 2009 -0500
+++ b/config	Tue Oct 06 17:57:23 2009 -0500
@@ -128,3 +128,6 @@
 # each stage of the build.
 
 # export BINARY_PACKAGE_TARBALLS=1
+
+# Define the C library used here. Default is uClibc
+# export C_LIBRARY=uClibc
--- a/cross-compiler.sh	Tue Oct 06 08:58:56 2009 -0500
+++ b/cross-compiler.sh	Tue Oct 06 17:57:23 2009 -0500
@@ -24,9 +24,11 @@
 
 FROM_ARCH="" PROGRAM_PREFIX="${ARCH}-" build_section binutils-gcc
 
-# Build uClibc
+# Build C Library
 
-HOST_UTILS=1 build_section uClibc
+[ -z "$C_LIBRARY" ] && C_LIBRARY=uClibc
+
+HOST_UTILS=1 build_section $C_LIBRARY
 
 cat > "${STAGE_DIR}"/README << EOF &&
 Cross compiler for $ARCH
--- a/root-filesystem.sh	Tue Oct 06 08:58:56 2009 -0500
+++ b/root-filesystem.sh	Tue Oct 06 17:57:23 2009 -0500
@@ -47,9 +47,11 @@
   mkdir -p "$STAGE_DIR/bin" || dienow
 fi
 
-# Build uClibc
+# Build C Library
 
-STAGE_DIR="$ROOT_TOPDIR" build_section uClibc
+[ -z "$C_LIBRARY" ] && C_LIBRARY=uClibc
+
+STAGE_DIR="$ROOT_TOPDIR" build_section $C_LIBRARY
 
 if [ "$NATIVE_TOOLCHAIN" == "none" ]
 then
@@ -106,7 +108,7 @@
 
 cp -r "${SOURCES}/native/." "$ROOT_TOPDIR/" &&
 cp "$SRCDIR"/MANIFEST "$ROOT_TOPDIR/src" &&
-cp "${WORK}/config-uClibc" "$ROOT_TOPDIR/src/config-uClibc" || dienow
+cp "${WORK}/config-${C_LIBRARY}" "$ROOT_TOPDIR/src/config-${C_LIBRARY}" || dienow
 
 # Build and install toybox