Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix FS#12179 - Simulator build fails when using "configure --sdl-threads"

Browse source 
Change the logic in configure to record the entire command line from the
beginning and filter out options that are set again by configure.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30134 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2011-07-09 08:23:36 +00:00
parent a802ebac06
commit 9e8d7dc07c
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tools/configure vendored
View file

@ -29,6 +29,7 @@ thread_support="ASSEMBLER_THREADS"
app_lcd_width= app_lcd_width=
app_lcd_height= app_lcd_height=
app_lcd_orientation= app_lcd_orientation=
cmdline="$@"
# #
# Begin Function Definitions # Begin Function Definitions
# #
@ -3630,22 +3631,19 @@ if test "$apps" = "apps"; then
fi fi
#### Fix the cmdline ### #### Fix the cmdline ###
if [ "$ARG_CCACHE" = "1" ]; then
cmdline="--ccache "
elif [ "$ARG_CCACHE" = "0" ]; then
cmdline="--no-ccache "
fi
if [ "$ARG_ARM_EABI" = "1" ]; then
cmdline="$cmdline--eabi "
fi
if [ -n "$ARG_PREFIX" ]; then if [ -n "$ARG_PREFIX" ]; then
cmdline="$cmdline--prefix=\$(PREFIX) " cmdline="$cmdline --prefix=\$(PREFIX)"
fi fi
if [ -n "$ARG_LCDWIDTH" ]; then if [ -n "$ARG_LCDWIDTH" ]; then
cmdline="$cmdline--lcdwidth=$ARG_LCDWIDTH --lcdheight=$ARG_LCDHEIGHT " cmdline="$cmdline --lcdwidth=$ARG_LCDWIDTH --lcdheight=$ARG_LCDHEIGHT "
fi fi
cmdline="$cmdline--target=\$(MODELNAME) --ram=\$(MEMORYSIZE) --rbdir=\$(RBDIR) --type=$btype$advopts" # remove parts from the cmdline we're going to set unconditionally
cmdline=`echo $cmdline | sed -e s,--target=[a-zA-Z0-9]\*,,g \
-e s,--ram=[0-9]\*,,g \
-e s,--rbdir=[./a-zA-Z0-9]\*,,g \
-e s,--type=[a-zA-Z]\*,,g`
cmdline="$cmdline --target=\$(MODELNAME) --ram=\$(MEMORYSIZE) --rbdir=\$(RBDIR) --type=$btype$advopts"
### end of cmdline ### end of cmdline