From 9e8d7dc07cf580418bd70597be535177604fffd0 Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
Date: Sat, 9 Jul 2011 08:23:36 +0000
Subject: [PATCH] Fix FS#12179 - Simulator build fails when using "configure
 --sdl-threads"

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
---
 tools/configure | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/tools/configure b/tools/configure
index 78a90b7d18..420f9c0c4a 100755
--- a/tools/configure
+++ b/tools/configure
@@ -29,6 +29,7 @@ thread_support="ASSEMBLER_THREADS"
 app_lcd_width=
 app_lcd_height=
 app_lcd_orientation=
+cmdline="$@"
 #
 # Begin Function Definitions
 #
@@ -3630,22 +3631,19 @@ if test "$apps" = "apps"; then
 fi
 
 #### 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
-  cmdline="$cmdline--prefix=\$(PREFIX) "
+  cmdline="$cmdline --prefix=\$(PREFIX)"
 fi
 if [ -n "$ARG_LCDWIDTH" ]; then
-  cmdline="$cmdline--lcdwidth=$ARG_LCDWIDTH --lcdheight=$ARG_LCDHEIGHT "
+  cmdline="$cmdline --lcdwidth=$ARG_LCDWIDTH --lcdheight=$ARG_LCDHEIGHT "
 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