Browse Source

sde-build-tools: improve libc detection to support fl_wrapper for musl

master
Alejandro Mery 10 years ago
parent
commit
553ca808ed
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      bin/sde-build-tools

+ 5
- 5
bin/sde-build-tools

@ -3,7 +3,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: bin/sde-build-tools
# Copyright (C) 2006 - 2013 The OpenSDE Project
# Copyright (C) 2006 - 2014 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
@ -286,13 +286,13 @@ if [ ! -f $TOOLSDIR/.lastupdate ] ; then
# Flist Wrapper Library
#
if [ "$SDECFG_FLIST" = "flwrapper" ] ; then
echo_status "Building $toolsdir/lib/fl_wrapper.so."
FLWRAPPER_LIBC=$(ls -1 "$xroot"/{lib64,lib}/libc.* \
"$xroot"/{lib64,lib}/*/libc.* 2>/dev/null |
head -n1 )
FLWRAPPER_LIBC=$(ls -1 "$xroot"/{lib64,lib}/libc[.-]* \
"$xroot"/{lib64,lib}/*/libc[.-]* 2>/dev/null |
sort -V | head -n1 )
if [ ! -f "$FLWRAPPER_LIBC" ]; then
abort 'Unable to detect /lib/libc.* for flwrapper'
fi
echo_status "Building $toolsdir/lib/fl_wrapper.so ($FLWRAPPER_LIBC)."
if ! atstage native; then
FLWRAPPER_BASEDIR="$base"

Loading…
Cancel
Save