diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 20 |
1 files 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" | |||
29 | app_lcd_width= | 29 | app_lcd_width= |
30 | app_lcd_height= | 30 | app_lcd_height= |
31 | app_lcd_orientation= | 31 | app_lcd_orientation= |
32 | cmdline="$@" | ||
32 | # | 33 | # |
33 | # Begin Function Definitions | 34 | # Begin Function Definitions |
34 | # | 35 | # |
@@ -3630,22 +3631,19 @@ if test "$apps" = "apps"; then | |||
3630 | fi | 3631 | fi |
3631 | 3632 | ||
3632 | #### Fix the cmdline ### | 3633 | #### Fix the cmdline ### |
3633 | if [ "$ARG_CCACHE" = "1" ]; then | ||
3634 | cmdline="--ccache " | ||
3635 | elif [ "$ARG_CCACHE" = "0" ]; then | ||
3636 | cmdline="--no-ccache " | ||
3637 | fi | ||
3638 | if [ "$ARG_ARM_EABI" = "1" ]; then | ||
3639 | cmdline="$cmdline--eabi " | ||
3640 | fi | ||
3641 | if [ -n "$ARG_PREFIX" ]; then | 3634 | if [ -n "$ARG_PREFIX" ]; then |
3642 | cmdline="$cmdline--prefix=\$(PREFIX) " | 3635 | cmdline="$cmdline --prefix=\$(PREFIX)" |
3643 | fi | 3636 | fi |
3644 | if [ -n "$ARG_LCDWIDTH" ]; then | 3637 | if [ -n "$ARG_LCDWIDTH" ]; then |
3645 | cmdline="$cmdline--lcdwidth=$ARG_LCDWIDTH --lcdheight=$ARG_LCDHEIGHT " | 3638 | cmdline="$cmdline --lcdwidth=$ARG_LCDWIDTH --lcdheight=$ARG_LCDHEIGHT " |
3646 | fi | 3639 | fi |
3647 | 3640 | ||
3648 | cmdline="$cmdline--target=\$(MODELNAME) --ram=\$(MEMORYSIZE) --rbdir=\$(RBDIR) --type=$btype$advopts" | 3641 | # remove parts from the cmdline we're going to set unconditionally |
3642 | cmdline=`echo $cmdline | sed -e s,--target=[a-zA-Z0-9]\*,,g \ | ||
3643 | -e s,--ram=[0-9]\*,,g \ | ||
3644 | -e s,--rbdir=[./a-zA-Z0-9]\*,,g \ | ||
3645 | -e s,--type=[a-zA-Z]\*,,g` | ||
3646 | cmdline="$cmdline --target=\$(MODELNAME) --ram=\$(MEMORYSIZE) --rbdir=\$(RBDIR) --type=$btype$advopts" | ||
3649 | 3647 | ||
3650 | ### end of cmdline | 3648 | ### end of cmdline |
3651 | 3649 | ||