* CONFIG_TCC_*LDDIR should not be exported if no --*lddir option is used. * Don't write a : at the beginning of extralddir
Unified · Split
| @@ -112,7 +112,7 @@ for opt do · 111 unmodified lines | |||
| 112 | ;; | 112 | ;; |
| 113 | --lddir=*) lddir=`echo $opt | cut -d '=' -f 2` | 113 | --lddir=*) lddir=`echo $opt | cut -d '=' -f 2` |
| 114 | ;; | 114 | ;; |
| 115 | --extralddir=*) extralddir="$extralddir:`echo $opt | cut -d '=' -f 2`" | 115 | --extralddir=*) extralddir="${extralddir:+:}`echo $opt | cut -d '=' -f 2`" |
| 116 | ;; | 116 | ;; |
| 117 | --includedir=*) includedir=`echo $opt | cut -d '=' -f 2` | 117 | --includedir=*) includedir=`echo $opt | cut -d '=' -f 2` |
| 118 | ;; | 118 | ;; |
| @@ -366,9 +366,13 @@ echo "docdir=\$(DESTDIR)$docdir" >> config.mak · 247 unmodified lines | |||
| 366 | echo "#define CONFIG_SYSROOT \"$sysroot\"" >> $TMPH | 366 | echo "#define CONFIG_SYSROOT \"$sysroot\"" >> $TMPH |
| 367 | echo "#ifndef CONFIG_TCCDIR" >> $TMPH | 367 | echo "#ifndef CONFIG_TCCDIR" >> $TMPH |
| 368 | echo "#define CONFIG_TCCDIR \"$tccdir\"" >> $TMPH | 368 | echo "#define CONFIG_TCCDIR \"$tccdir\"" >> $TMPH |
| 369 | echo "#define CONFIG_TCC_LDDIR \"$lddir\"" >> $TMPH | ||
| 370 | echo "#define CONFIG_TCC_EXTRA_LDDIR \"$extralddir\"" >> $TMPH | ||
| 371 | echo "#endif" >> $TMPH | 369 | echo "#endif" >> $TMPH |
| 370 | if test -n "$lddir" ; then | ||
| 371 | echo "#define CONFIG_TCC_LDDIR \"$lddir\"" >> $TMPH | ||
| 372 | fi | ||
| 373 | if test -n "$extralddir" ; then | ||
| 374 | echo "#define CONFIG_TCC_EXTRA_LDDIR \"$extralddir\"" >> $TMPH | ||
| 375 | fi | ||
| 372 | echo "CC=$cc" >> config.mak | 376 | echo "CC=$cc" >> config.mak |
| 373 | echo "GCC_MAJOR=$gcc_major" >> config.mak | 377 | echo "GCC_MAJOR=$gcc_major" >> config.mak |
| 374 | echo "#define GCC_MAJOR $gcc_major" >> $TMPH | 378 | echo "#define GCC_MAJOR $gcc_major" >> $TMPH |