dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default

Browse Source
This commit is contained in:
truelight
2007-06-11 10:01:03 +00:00
parent 41443a26a6
commit 7f31589c62
1 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
config.lib
View File

@@ -44,6 +44,7 @@ set_default() {
enable_universal="1" enable_universal="1"
enable_osx_g5="0" enable_osx_g5="0"
enable_unicode="1" enable_unicode="1"
with_distcc="1"
with_osx_sysroot="1" with_osx_sysroot="1"
with_application_bundle="1" with_application_bundle="1"
with_sdl="1" with_sdl="1"
@@ -61,7 +62,7 @@ set_default() {
with_fontconfig="1" with_fontconfig="1"
with_psp_config="1" with_psp_config="1"
save_params_array="build host cc_build cc_host cxx_build cxx_host windres strip awk lipo os revision endian config_log prefix_dir binary_dir data_dir icon_dir personal_dir install_dir custom_lang_dir second_data_dir enable_install enable_debug enable_profiling enable_dedicated enable_network enable_static enable_translator enable_assert enable_strip with_osx_sysroot enable_universal enable_osx_g5 enable_unicode with_application_bundle with_sdl with_cocoa with_zlib with_png with_makedepend with_direct_music with_sort with_iconv with_midi with_midi_arg with_libtimidity with_freetype with_fontconfig with_psp_config CC CXX CFLAGS LDFLAGS" save_params_array="build host cc_build cc_host cxx_build cxx_host windres strip awk lipo os revision endian config_log prefix_dir binary_dir data_dir icon_dir personal_dir install_dir custom_lang_dir second_data_dir enable_install enable_debug enable_profiling enable_dedicated enable_network enable_static enable_translator enable_assert enable_strip with_distcc with_osx_sysroot enable_universal enable_osx_g5 enable_unicode with_application_bundle with_sdl with_cocoa with_zlib with_png with_makedepend with_direct_music with_sort with_iconv with_midi with_midi_arg with_libtimidity with_freetype with_fontconfig with_psp_config CC CXX CFLAGS LDFLAGS"
} }
detect_params() { detect_params() {
@@ -235,6 +236,10 @@ detect_params() {
--with-midi=*) with_midi="$optarg";; --with-midi=*) with_midi="$optarg";;
--with-midi-arg=*) with_midi_arg="$optarg";; --with-midi-arg=*) with_midi_arg="$optarg";;
--without-distcc) with_distcc="0";;
--with-distcc) with_distcc="2";;
--with-distcc=*) with_distcc="$optarg";;
--without-osx-sysroot) with_osx_sysroot="0";; --without-osx-sysroot) with_osx_sysroot="0";;
--with-osx-sysroot) with_osx_sysroot="2";; --with-osx-sysroot) with_osx_sysroot="2";;
--with-osx-sysroot=*) with_osx_sysroot="$optarg";; --with-osx-sysroot=*) with_osx_sysroot="$optarg";;
@@ -512,6 +517,34 @@ check_params() {
log 1 "checking stripping... skipped" log 1 "checking stripping... skipped"
fi fi
if [ "$with_distcc" = "0" ]; then
log 1 "checking distcc... no"
elif [ "$with_distcc" = "1" ]; then
with_distcc="0"
log 1 "checking distcc... no (only used when forced)"
elif [ "$with_distcc" = "2" ]; then
distcc="distcc"
else
distcc="$with_distcc"
fi
if [ "$with_distcc" != "0" ]; then
res="`$distcc --version 2>/dev/null | head -n 1 | cut -b 0-6`"
if [ "$res" != "distcc" ]; then
log 1 "checking distcc... no"
if [ "$with_distcc" = "2" ]; then
log 1 "configure: error: no distcc detected, but was forced to be used"
exit 1
fi
if [ "$with_distcc" != "1" ]; then
log 1 "configure: error: '$with_distcc' doesn't seem a distcc to me"
exit 1
fi
fi
log 1 "checking distcc... $distcc"
fi
if [ "$os" != "OSX" ] && [ "$with_osx_sysroot" != "0" ]; then if [ "$os" != "OSX" ] && [ "$with_osx_sysroot" != "0" ]; then
if [ "$with_osx_sysroot" = "1" ]; then if [ "$with_osx_sysroot" = "1" ]; then
with_osx_sysroot="0" with_osx_sysroot="0"
@@ -988,6 +1021,14 @@ make_cflags_and_ldflags() {
else else
makedepend="" makedepend=""
fi fi
if [ "$with_distcc" != "0" ]; then
cc_host="$distcc $cc_host"
cxx_host="$distcc $cxx_host"
log 1 ""
log 1 " NOTICE: remind yourself to use 'make -jN' to make use of distcc"
log 1 ""
fi
} }
check_compiler() { check_compiler() {