Unified · Split
| @@ -18,10 +18,12 @@ TMPS="${TMPDIR1}/tcc-conf-${RANDOM}-$$-${RANDOM}.S" · 17 unmodified lines | |||
| 18 | TMPH="${TMPDIR1}/tcc-conf-${RANDOM}-$$-${RANDOM}.h" | 18 | TMPH="${TMPDIR1}/tcc-conf-${RANDOM}-$$-${RANDOM}.h" |
| 19 | 19 | ||
| 20 | # default parameters | 20 | # default parameters |
| 21 | build_cross="no" | ||
| 21 | prefix="" | 22 | prefix="" |
| 22 | execprefix="" | 23 | execprefix="" |
| 23 | bindir="" | 24 | bindir="" |
| 24 | libdir="" | 25 | libdir="" |
| 26 | tccdir="" | ||
| 25 | includedir="" | 27 | includedir="" |
| 26 | mandir="" | 28 | mandir="" |
| 27 | cross_prefix="" | 29 | cross_prefix="" |
| @@ -114,6 +116,8 @@ for opt do · 86 unmodified lines | |||
| 114 | ;; | 116 | ;; |
| 115 | --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-" | 117 | --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-" |
| 116 | ;; | 118 | ;; |
| 119 | --enable-cross) build_cross="yes" | ||
| 120 | ;; | ||
| 117 | esac | 121 | esac |
| 118 | done | 122 | done |
| 119 | 123 | ||
| @@ -190,6 +194,7 @@ echo " --bindir=DIR user executables in DIR [EPREFIX/bin]" · 70 unmodified lines | |||
| 190 | echo " --libdir=DIR object code libraries in DIR [EPREFIX/lib]" | 194 | echo " --libdir=DIR object code libraries in DIR [EPREFIX/lib]" |
| 191 | echo " --includedir=DIR C header files in DIR [PREFIX/include]" | 195 | echo " --includedir=DIR C header files in DIR [PREFIX/include]" |
| 192 | echo " --mandir=DIR man documentation in DIR [PREFIX/man]" | 196 | echo " --mandir=DIR man documentation in DIR [PREFIX/man]" |
| 197 | echo " --build-cross build cross compilers" | ||
| 193 | echo "" | 198 | echo "" |
| 194 | echo "Advanced options (experts only):" | 199 | echo "Advanced options (experts only):" |
| 195 | echo " --source-path=PATH path of source code [$source_path]" | 200 | echo " --source-path=PATH path of source code [$source_path]" |
| @@ -207,6 +212,7 @@ if test "$mingw32" = "yes" ; then · 11 unmodified lines | |||
| 207 | fi | 212 | fi |
| 208 | execprefix="$prefix" | 213 | execprefix="$prefix" |
| 209 | bindir="$prefix" | 214 | bindir="$prefix" |
| 215 | tccdir="$prefix" | ||
| 210 | docdir="$prefix/doc" | 216 | docdir="$prefix/doc" |
| 211 | else | 217 | else |
| 212 | if test -z "$prefix" ; then | 218 | if test -z "$prefix" ; then |
| @@ -226,6 +232,9 @@ fi # mingw32 · 13 unmodified lines | |||
| 226 | if test x"$libdir" = x""; then | 232 | if test x"$libdir" = x""; then |
| 227 | libdir="${execprefix}/lib" | 233 | libdir="${execprefix}/lib" |
| 228 | fi | 234 | fi |
| 235 | if test x"$tccdir" = x""; then | ||
| 236 | tccdir="${execprefix}/lib/tcc" | ||
| 237 | fi | ||
| 229 | if test x"$mandir" = x""; then | 238 | if test x"$mandir" = x""; then |
| 230 | mandir="${prefix}/man" | 239 | mandir="${prefix}/man" |
| 231 | fi | 240 | fi |
| @@ -234,6 +243,7 @@ includedir="${prefix}/include" · 2 unmodified lines | |||
| 234 | fi | 243 | fi |
| 235 | 244 | ||
| 236 | echo "Binary directory $bindir" | 245 | echo "Binary directory $bindir" |
| 246 | echo "TinyCC directory $tccdir" | ||
| 237 | echo "Library directory $libdir" | 247 | echo "Library directory $libdir" |
| 238 | echo "Include directory $includedir" | 248 | echo "Include directory $includedir" |
| 239 | echo "Manual directory $mandir" | 249 | echo "Manual directory $mandir" |
| @@ -244,6 +254,7 @@ echo "make $make" · 4 unmodified lines | |||
| 244 | echo "CPU $cpu" | 254 | echo "CPU $cpu" |
| 245 | echo "Big Endian $bigendian" | 255 | echo "Big Endian $bigendian" |
| 246 | echo "gprof enabled $gprof" | 256 | echo "gprof enabled $gprof" |
| 257 | echo "cross compilers $build_cross" | ||
| 247 | 258 | ||
| 248 | echo "Creating config.mak and config.h" | 259 | echo "Creating config.mak and config.h" |
| 249 | 260 | ||
| @@ -252,11 +263,12 @@ echo "/* Automatically generated by configure - do not modify */" > $TMPH · 2 unmodified lines | |||
| 252 | 263 | ||
| 253 | echo "prefix=$prefix" >> config.mak | 264 | echo "prefix=$prefix" >> config.mak |
| 254 | echo "bindir=$bindir" >> config.mak | 265 | echo "bindir=$bindir" >> config.mak |
| 266 | echo "tccdir=$tccdir" >> config.mak | ||
| 255 | echo "libdir=$libdir" >> config.mak | 267 | echo "libdir=$libdir" >> config.mak |
| 256 | echo "includedir=$includedir" >> config.mak | 268 | echo "includedir=$includedir" >> config.mak |
| 257 | echo "mandir=$mandir" >> config.mak | 269 | echo "mandir=$mandir" >> config.mak |
| 258 | echo "docdir=$docdir" >> config.mak | 270 | echo "docdir=$docdir" >> config.mak |
| 259 | echo "#define CONFIG_TCC_LIBDIR \"$libdir\"" >> $TMPH | 271 | echo "#define CONFIG_TCCDIR \"$tccdir\"" >> $TMPH |
| 260 | echo "MAKE=$make" >> config.mak | 272 | echo "MAKE=$make" >> config.mak |
| 261 | echo "CC=$cc" >> config.mak | 273 | echo "CC=$cc" >> config.mak |
| 262 | echo "GCC_MAJOR=$gcc_major" >> config.mak | 274 | echo "GCC_MAJOR=$gcc_major" >> config.mak |
| @@ -302,6 +314,9 @@ if test "$gprof" = "yes" ; then · 39 unmodified lines | |||
| 302 | echo "TARGET_GPROF=yes" >> config.mak | 314 | echo "TARGET_GPROF=yes" >> config.mak |
| 303 | echo "#define HAVE_GPROF 1" >> $TMPH | 315 | echo "#define HAVE_GPROF 1" >> $TMPH |
| 304 | fi | 316 | fi |
| 317 | if test "$build_cross" = "yes" ; then | ||
| 318 | echo "CONFIG_CROSS=yes" >> config.mak | ||
| 319 | fi | ||
| 305 | version=`head $source_path/VERSION` | 320 | version=`head $source_path/VERSION` |
| 306 | echo "VERSION=$version" >>config.mak | 321 | echo "VERSION=$version" >>config.mak |
| 307 | echo "#define TCC_VERSION \"$version\"" >> $TMPH | 322 | echo "#define TCC_VERSION \"$version\"" >> $TMPH |