changeset 1673:0f61292eab70

Add MUSL=1 config option to force musl build.
author Rob Landley <rob@landley.net>
date Sun, 17 Aug 2014 00:06:04 -0500
parents 3c45686b2a8a
children 263bb9ff9657
files native-compiler.sh simple-cross-compiler.sh sources/variables.sh
diffstat 3 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/native-compiler.sh	Fri Aug 15 18:46:51 2014 -0500
+++ b/native-compiler.sh	Sun Aug 17 00:06:04 2014 -0500
@@ -21,7 +21,12 @@
 # Build C Library
 
 build_section linux-headers
-[ -z "$UCLIBC_CONFIG" ] && build_section musl || build_section uClibc
+if [ -z "$UCLIBC_CONFIG" ] || [ ! -z "$MUSL" ]
+then 
+  build_section musl
+else
+  build_section uClibc
+fi
 
 # Build binutils, gcc, and ccwrap
 
--- a/simple-cross-compiler.sh	Fri Aug 15 18:46:51 2014 -0500
+++ b/simple-cross-compiler.sh	Sun Aug 17 00:06:04 2014 -0500
@@ -34,7 +34,12 @@
 
 build_section linux-headers
 
-[ -z "$UCLIBC_CONFIG" ] && build_section musl || build_section uClibc
+if [ -z "$UCLIBC_CONFIG" ] || [ ! -z "$MUSL" ]
+then
+  build_section musl
+else
+  build_section uClibc
+fi
 
 cat > "${STAGE_DIR}"/README << EOF &&
 Cross compiler for $ARCH from http://aboriginal.impactlinux.com
--- a/sources/variables.sh	Fri Aug 15 18:46:51 2014 -0500
+++ b/sources/variables.sh	Sun Aug 17 00:06:04 2014 -0500
@@ -17,7 +17,7 @@
   TEMP="$TEMP,LANG,PATH,SHELL,TERM,USER,USERNAME,LOGNAME,PWD,EDITOR,HOME"
   TEMP="$TEMP,DISPLAY,_,TOPSHELL,START_TIME,STAGE_NAME,TOOLCHAIN_PREFIX"
   TEMP="$TEMP,HOST_ARCH,WRAPPY_LOGPATH,OLDPATH,http_proxy,ftp_proxy"
-  TEMP="$TEMP,https_proxy,no_proxy,TEMP,TMPDIR,FORK"
+  TEMP="$TEMP,https_proxy,no_proxy,TEMP,TMPDIR,FORK,MUSL"
 
   # Unset any variable we don't recognize.  It can screw up the build.