History

Fix commit 31ca000d

* CONFIG_TCC_*LDDIR should not be exported if no --*lddir option is used. * Don't write a : at the beginning of extralddir

Thomas Preud'homme committed 15 years ago

Commit 38de06e1 parent 31ca0001 file · +7 −3Browse files

Unified · Split

configure+7−3
@@ -112,7 +112,7 @@ for opt do · 111 unmodified lines
112112 ;;
113113 --lddir=*) lddir=`echo $opt | cut -d '=' -f 2`
114114 ;;
115− --extralddir=*) extralddir="$extralddir:`echo $opt | cut -d '=' -f 2`"
115+ --extralddir=*) extralddir="${extralddir:+:}`echo $opt | cut -d '=' -f 2`"
116116 ;;
117117 --includedir=*) includedir=`echo $opt | cut -d '=' -f 2`
118118 ;;
@@ -366,9 +366,13 @@ echo "docdir=\$(DESTDIR)$docdir" >> config.mak · 247 unmodified lines
366366 echo "#define CONFIG_SYSROOT \"$sysroot\"" >> $TMPH
367367 echo "#ifndef CONFIG_TCCDIR" >> $TMPH
368368 echo "#define CONFIG_TCCDIR \"$tccdir\"" >> $TMPH
369−echo "#define CONFIG_TCC_LDDIR \"$lddir\"" >> $TMPH
370−echo "#define CONFIG_TCC_EXTRA_LDDIR \"$extralddir\"" >> $TMPH
371369 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
372376 echo "CC=$cc" >> config.mak
373377 echo "GCC_MAJOR=$gcc_major" >> config.mak
374378 echo "#define GCC_MAJOR $gcc_major" >> $TMPH

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t