After commit 4d6a4a26e08ef8581c70d29f578a42ab7d738c2d, the changes in configure are no longer needed.
Unified · Split
| @@ -26,8 +26,6 @@ prefix="" · 25 unmodified lines | |||
| 26 | execprefix="" | 26 | execprefix="" |
| 27 | bindir="" | 27 | bindir="" |
| 28 | libdir="" | 28 | libdir="" |
| 29 | lddir="" | ||
| 30 | extralddir="" | ||
| 31 | tccdir="" | 29 | tccdir="" |
| 32 | includedir="" | 30 | includedir="" |
| 33 | mandir="" | 31 | mandir="" |
| @@ -110,10 +108,6 @@ for opt do · 76 unmodified lines | |||
| 110 | ;; | 108 | ;; |
| 111 | --libdir=*) libdir=`echo $opt | cut -d '=' -f 2` | 109 | --libdir=*) libdir=`echo $opt | cut -d '=' -f 2` |
| 112 | ;; | 110 | ;; |
| 113 | --lddir=*) lddir=`echo $opt | cut -d '=' -f 2` | ||
| 114 | ;; | ||
| 115 | --extralddir=*) extralddir="${extralddir:+:}`echo $opt | cut -d '=' -f 2`" | ||
| 116 | ;; | ||
| 117 | --includedir=*) includedir=`echo $opt | cut -d '=' -f 2` | 111 | --includedir=*) includedir=`echo $opt | cut -d '=' -f 2` |
| 118 | ;; | 112 | ;; |
| 119 | --sharedir=*) sharedir=`echo $opt | cut -d '=' -f 2` | 113 | --sharedir=*) sharedir=`echo $opt | cut -d '=' -f 2` |
| @@ -247,8 +241,6 @@ echo " --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX · 127 unmodified lines | |||
| 247 | echo " [same as prefix]" | 241 | echo " [same as prefix]" |
| 248 | echo " --bindir=DIR user executables in DIR [EPREFIX/bin]" | 242 | echo " --bindir=DIR user executables in DIR [EPREFIX/bin]" |
| 249 | echo " --libdir=DIR object code libraries in DIR [EPREFIX/lib]" | 243 | echo " --libdir=DIR object code libraries in DIR [EPREFIX/lib]" |
| 250 | echo " --lddir=DIR loader library search path in DIR [/lib]" | ||
| 251 | echo " --extralddir=DIR extra loader library search path in DIR []" | ||
| 252 | echo " --tccdir=DIR installation directory [EPREFIX/lib/tcc]" | 244 | echo " --tccdir=DIR installation directory [EPREFIX/lib/tcc]" |
| 253 | echo " --includedir=DIR C header files in DIR [PREFIX/include]" | 245 | echo " --includedir=DIR C header files in DIR [PREFIX/include]" |
| 254 | echo " --sharedir=DIR documentation root DIR [PREFIX]/share" | 246 | echo " --sharedir=DIR documentation root DIR [PREFIX]/share" |
| @@ -330,23 +322,21 @@ if test x"$includedir" = x""; then · 75 unmodified lines | |||
| 330 | includedir="${prefix}/include" | 322 | includedir="${prefix}/include" |
| 331 | fi | 323 | fi |
| 332 | 324 | ||
| 333 | echo "Binary directory $bindir" | 325 | echo "Binary directory $bindir" |
| 334 | echo "TinyCC directory $tccdir" | 326 | echo "TinyCC directory $tccdir" |
| 335 | echo "Library directory $libdir" | 327 | echo "Library directory $libdir" |
| 336 | echo "Loader library search directory ${lddir:-default value (see tcc.h)}" | 328 | echo "Include directory $includedir" |
| 337 | echo "Extra loader library search directory ${extralddir:-(none)}" | 329 | echo "Manual directory $mandir" |
| 338 | echo "Include directory $includedir" | 330 | echo "Info directory $infodir" |
| 339 | echo "Manual directory $mandir" | 331 | echo "Doc directory $docdir" |
| 340 | echo "Info directory $infodir" | 332 | echo "Target root prefix $sysroot" |
| 341 | echo "Doc directory $docdir" | 333 | echo "Source path $source_path" |
| 342 | echo "Target root prefix $sysroot" | 334 | echo "C compiler $cc" |
| 343 | echo "Source path $source_path" | 335 | echo "CPU $cpu" |
| 344 | echo "C compiler $cc" | 336 | echo "Big Endian $bigendian" |
| 345 | echo "CPU $cpu" | 337 | echo "gprof enabled $gprof" |
| 346 | echo "Big Endian $bigendian" | 338 | echo "cross compilers $build_cross" |
| 347 | echo "gprof enabled $gprof" | 339 | echo "use libgcc $use_libgcc" |
| 348 | echo "cross compilers $build_cross" | ||
| 349 | echo "use libgcc $use_libgcc" | ||
| 350 | 340 | ||
| 351 | echo "Creating config.mak and config.h" | 341 | echo "Creating config.mak and config.h" |
| 352 | 342 | ||
| @@ -367,12 +357,6 @@ echo "#define CONFIG_SYSROOT \"$sysroot\"" >> $TMPH · 14 unmodified lines | |||
| 367 | echo "#ifndef CONFIG_TCCDIR" >> $TMPH | 357 | echo "#ifndef CONFIG_TCCDIR" >> $TMPH |
| 368 | echo "#define CONFIG_TCCDIR \"$tccdir\"" >> $TMPH | 358 | echo "#define CONFIG_TCCDIR \"$tccdir\"" >> $TMPH |
| 369 | echo "#endif" >> $TMPH | 359 | 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 | ||
| 376 | echo "CC=$cc" >> config.mak | 360 | echo "CC=$cc" >> config.mak |
| 377 | echo "GCC_MAJOR=$gcc_major" >> config.mak | 361 | echo "GCC_MAJOR=$gcc_major" >> config.mak |
| 378 | echo "#define GCC_MAJOR $gcc_major" >> $TMPH | 362 | echo "#define GCC_MAJOR $gcc_major" >> $TMPH |