Ticket #10: configure.diff

File configure.diff, 18.8 KB (added by Valery V. Sedletski, 9 years ago)

Latest configure diff

  • (a) configure-old vs. (b) configure

    a b  
    1818export LC_ALL
    1919
    2020# append some extra paths
     21OS2PATH=$PATH
    2122PATH="$PATH:/opt/gnome/bin"
    2223# Solaris (order of paths important for tr, echo, grep, sed to work)
    2324PATH="/usr/xpg4/bin:/usr/ucb:$PATH:/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin"
    … …  
    3536  fi
    3637  if [ "$have_ancient_which" = "yes" ]; then
    3738    retval=`which $* 2>/dev/null`
    38     echo "$retval"
     39    # echo "$retval"
    3940    test -n "$retval" -a -x "$retval"
    40     unset retval
     41    # unset retval
    4142  else
    4243    which $* 2> /dev/null
    4344  fi
    4445}
    4546
    4647OS=`uname -s | sed -e 's/GNU\/Linux/Linux/g' | tr '[:upper:]' '[:lower:]'`
    47 case "$OS" in
     48OS=`echo $OS | sed -e 's|/||'`
     49
     50case $OS in
    4851  linux)
    4952    ;;
    5053  darwin)
    … …  
    5659    ;;
    5760  haiku)
    5861    ;;
     62  os2)
     63    PATH=${OS2PATH}
     64    ;;
    5965  *)
    6066    echo "Cannot determine OS!"
    6167    exit 1
    … …  
    142148  INCPNG="-I/usr/local/include"
    143149  LIBPNG="-L/usr/local/lib -lpng"
    144150else
     151  if [ "${OS}" = "os2" ]; then
     152    CXX_FLAGS="-Zomf"
     153  fi
    145154  INCCURL=""
    146155  LIBCURL="-lcurl"
    147156  INCPNG=""
    … …  
    150159INCVPX=""
    151160LIBVPX="-lvpx"
    152161PKGCONFIG="`which_wrapper pkg-config`"
    153 PYTHONDIR="/usr /usr/local"
     162PYTHONDIR="/usr /usr/lib /usr/local"
    154163QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr/lib64/qt4 /usr /usr/local"
    155164QT4DIR_PKGCONFIG=1
    156165QT4UIC3DIR="/usr/bin"
    … …  
    222231
    223232cnf_append()
    224233{
    225   printf "%-30s := %s\n" "$1" "$2" >> $CNF
     234  # change backslashes in paths to forward slashes
     235  x=`echo "$2" | sed -e 's,\\\\,\/,g'`
     236  printf "%-30s := %s\n" "$1" "$x" >> $CNF
    226237}
    227238
    228239strip_l()
    … …  
    242253
    243254prefix_I()
    244255{
    245   echo "$1"|$KBUILD_SED 's|^\/|-I/|g; s| \/| -I/|g'
     256  echo "$1"|$KBUILD_SED 's|^\/|-I/|g; s| \/| -I/|g; s|^\([a-zA-Z]\:\/\)|-I\1|g; s| \([a-zA-Z]\:\/\)| -I\1|g'
    246257}
    247258
    248259check_avail()
    … …  
    377388  DEVDIR_BIN="$DEVDIR/$OS.$BUILD_MACHINE/bin"
    378389  log_success "Determined build machine: $OS.$BUILD_MACHINE, target machine: $OS.$TARGET_MACHINE"
    379390
     391  echo "BUILD_HOST=\"$OS\"" >> $ENV
     392  echo "export BUILD_HOST" >> $ENV
    380393  echo "BUILD_PLATFORM=\"$OS\"" >> $ENV
    381394  echo "export BUILD_PLATFORM" >> $ENV
    382395  echo "BUILD_PLATFORM_ARCH=\"$BUILD_MACHINE\"" >> $ENV
    … …  
    389402  echo "export BUILD_TARGET_CPU" >> $ENV
    390403  echo "BUILD_TYPE=\"$BUILD_TYPE\"" >> $ENV
    391404  echo "export BUILD_TYPE" >> $ENV
     405 
     406  if [ "$OS" = "os2" ]; then
     407    # current dir
     408    wd=`pwd`
     409
     410    # Additional paths
     411    echo "EMXOMFLD_TYPE=\"$EMXOMFLD_TYPE\"" >> $ENV
     412    echo "export EMXOMFLD_TYPE" >> $ENV
     413
     414    echo "EMXOMFLD_LINKER=\"$EMXOMFLD_LINKER\"" >> $ENV
     415    echo "export EMXOMFLD_LINKER" >> $ENV
     416
     417    # static libs search path
     418    LIBRARY_PATH="${wd}/out/${OS}.${BUILD_MACHINE}/${BUILD_TYPE}/lib;${GCC_DIR}/usr/lib;${LIBRARY_PATH}"
     419
     420    echo "LIBRARY_PATH=\"${LIBRARY_PATH}\"" >> $ENV
     421    echo "export LIBRARY_PATH" >> $ENV
     422
     423    # echo "LD_LIBRARY_PATH=\"${LIBRARY_PATH}\"" >> $ENV
     424    # echo "export LD_LIBRARY_PATH" >> $ENV
     425
     426    echo "LIB=\"${WATCOM}/lib286\"" >> $ENV
     427    echo "export LIB" >> $ENV
     428
     429    C_INCLUDE_PATH="${GCC_DIR}/usr/include;${C_INCLUDE_PATH}"
     430
     431    echo "C_INCLUDE_PATH=\"${C_INCLUDE_PATH}\"" >> $ENV
     432    echo "export C_INCLUDE_PATH" >> $ENV
     433
     434    echo "CPLUS_INCLUDE_PATH=\"${C_INCLUDE_PATH}\"" >> $ENV
     435    echo "export CPLUS_INCLUDE_PATH" >> $ENV
     436
     437    echo "INCLUDE=\"${WATCOM}/h\"" >> $ENV
     438    echo "export INCLUDE" >> $ENV
     439
     440    EXT_LIBPATH="${wd}/out/${OS}.${BUILD_MACHINE}/${BUILD_TYPE}/bin"
     441    EXT_LIBPATH=`echo "$EXT_LIBPATH" | sed -e 's,\/,\\\\\\\\,g'`
     442    echo "BEGINLIBPATH=$EXT_LIBPATH" >> $ENV
     443    echo "export BEGINLIBPATH" >> $ENV
     444  fi
    392445}
    393446
    394447#
    … …  
    526579  # Check that the tools we use are there.
    527580  for prog in wasm wcc wlink;
    528581  do
    529     if [ ! -f "$WATCOM/$wc_bin/$prog" ]; then
     582    if [ ! -f "${WATCOM}/${wc_bin}/${prog}" -a ! -f "${WATCOM}/${wc_bin}/${prog}.exe" ]; then
    530583      log_failure "$WATCOM/$wc_bin/$prog does not exist or is not a regular file."
    531584      fail
    532585    fi
    … …  
    581634check_iasl()
    582635{
    583636  test_header iasl
     637  IASL2="`pwd`/tools/${OS}.${BUILD_MACHINE}/bin/iasl"
     638
    584639  if check_avail "$IASL" IASL; then
     640    iasl_found="yes"
     641  elif [ -f "${IASL2}" ]; then
     642    iasl_found="yes"
     643    IASL="${IASL2}"
     644  elif [ -f "${IASL2}.exe" ]; then
     645    iasl_found="yes"
     646    IASL="${IASL2}.exe"
     647  else
     648    iasl_found="no"
     649  fi
     650
     651  if [ "${iasl_found}" = "yes" ]; then
    585652    iasl_ver=`$IASL|grep "ASL.*version"|sed 's+^ASL.*version \([0-9]*\).*+\1+'`
    586653    if [ $? -ne 0 ]; then
    587654      log_failure "iasl not found"
    … …  
    590657      log_success "found version $iasl_ver"
    591658      cnf_append "VBOX_IASLCMD" "`which_wrapper $IASL`"
    592659    fi
     660  else
     661    log_failure "iasl not found"
     662    fail
    593663  fi
    594664}
    595665
    … …  
    739809      fail
    740810    else
    741811      log_success "found version $libidl_ver"
    742       cnf_append "VBOX_LIBIDL_CONFIG" \
    743         "PKG_CONFIG_PATH=`libIDL-config-2 --prefix`/$LIB/pkgconfig `which_wrapper libIDL-config-2`"
     812      cnf_append "VBOX_LIBIDL_CONFIG" "`which_wrapper libIDL-config-2`"
     813      cnf_append "VBOX_PATH_LIBIDL" "`libIDL-config-2 --prefix`"
     814      cnf_append "PKG_CONFIG_PATH" "`libIDL-config-2 --prefix`/$LIB/pkgconfig"
    744815    fi
    745   elif check_avail "libIDL-config" libIDL-config; then
     816  elif which_wrapper libIDL-config > /dev/null; then
    746817    libidl_ver=`libIDL-config --version`
    747818    if [ $? -ne 0 ]; then
    748819      log_failure "libIDL-config not working"
    … …  
    750821    else
    751822      log_success "found version $libidl_ver"
    752823      cnf_append "VBOX_LIBIDL_CONFIG" "`which_wrapper libIDL-config`"
     824      cnf_append "VBOX_PATH_LIBIDL" "`libIDL-config --prefix`"
     825      cnf_append "PKG_CONFIG_PATH" "`libIDL-config --prefix`/$LIB/pkgconfig"
     826    fi
     827  else
     828    # no libIDL-config or libIDL-config-2 on PATH
     829    idl_prefix="/usr"
     830
     831    if [ "${GLIBIDL2}" != "" ]; then
     832      idl_prefix="${GLIBIDL2}"
     833    fi
     834
     835    idl_config=""
     836
     837    if [ -f "${idl_prefix}/bin/libIDL-config-2" ]; then
     838        idl_config="${idl_prefix}/bin/libIDL-config-2"
     839    elif [ -f "${idl_prefix}/bin/libIDL-config" ]; then
     840        idl_config="${idl_prefix}/bin/libIDL-config"
     841    fi
     842
     843    if [ "${idl_config}" = "" ]; then
     844      log_failure "${idl_config} not working"
     845      fail
     846    fi
     847
     848    libidl_ver=`${idl_config} --version`
     849    if [ $? -ne 0 ]; then
     850      log_failure "${idl_config} not working"
     851      fail
     852    else
     853      log_success "found version $libidl_ver"
     854      cnf_append "VBOX_LIBIDL_CONFIG" "${idl_config}"
     855      cnf_append "VBOX_PATH_LIBIDL" "`${idl_config} --prefix`"
     856      cnf_append "PKG_CONFIG_PATH" "`${idl_config} --prefix`/$LIB/pkgconfig"
     857    fi
     858  fi
     859
     860  test_header libglib
     861
     862  if which_wrapper glib-config > /dev/null; then
     863    glib_ver=`glib-config --version`
     864    if [ $? -ne 0 ]; then
     865      log_failure "glib-config not working"
     866      return
     867      # fail
     868    else
     869      log_success "found version $glib_ver"
     870      cnf_append "VBOX_PATH_GLIB" "`glib-config --prefix`"
     871      cnf_append "VBOX_GLIB_CONFIG" "`which_wrapper glib-config`"
     872    fi
     873  else
     874    # no glib-config on PATH
     875    glib_prefix="/usr"
     876
     877    if [ "${GLIBIDL2}" != "" ]; then
     878      glib_prefix="${GLIBIDL2}"
     879    fi
     880
     881    glib_config=""
     882
     883    if [ -f "${glib_prefix}/bin/glib-config" ]; then
     884        glib_config="${glib_prefix}/bin/glib-config"
     885    fi
     886
     887    if [ "${glib_config}" = "" ]; then
     888      log_failure "${glib_config} not working"
     889      return
     890      # fail
     891    fi
     892
     893    glib_ver=`${glib_config} --version`
     894    if [ $? -ne 0 ]; then
     895      log_failure "${glib_config} not working"
     896      return
     897      # fail
     898    else
     899      log_success "found version ${glib_ver}"
     900      cnf_append "VBOX_PATH_GLIB" "`${glib_config} --prefix`"
     901      cnf_append "VBOX_GLIB_CONFIG" "${glib_config}"
    753902    fi
    754903  fi
    755904}
    … …  
    837986        cnf_append "SDK_VBOX_OPENSSL_LIBS" "`strip_l "$LIBCRYPTO"`"
    838987        cnf_append "SDK_VBOX_BLD_OPENSSL_LIBS" "`strip_l "$LIBCRYPTO"`"
    839988      fi
     989    elif test_compile "$INCCRYPTO $LIBCRYPTO" crypto10 ssl10; then
     990      if test_execute nofatal; then
     991        cnf_append "SDK_VBOX_OPENSSL_INCS" "`strip_I "$INCCRYPTO"`"
     992        cnf_append "SDK_VBOX_OPENSSL_LIBS" "`strip_l "$LIBCRYPTO"`"
     993        cnf_append "SDK_VBOX_BLD_OPENSSL_LIBS" "`strip_l "$LIBCRYPTO"`"
     994      fi
     995    elif test_compile "$INCCRYPTO $LIBCRYPTO" kcrypt10 kssl10; then
     996      if test_execute nofatal; then
     997        cnf_append "SDK_VBOX_OPENSSL_INCS" "`strip_I "$INCCRYPTO"`"
     998        cnf_append "SDK_VBOX_OPENSSL_LIBS" "`strip_l "$LIBCRYPTO"`"
     999        cnf_append "SDK_VBOX_BLD_OPENSSL_LIBS" "`strip_l "$LIBCRYPTO"`"
     1000      fi
    8401001    fi
    8411002  fi
    8421003}
    … …  
    9011062  [ -n "$INCZ" ] && I_INCZ=`prefix_I "$INCZ"`
    9021063  if test_compile "$LIBZ $I_INCZ" zlib zlib; then
    9031064    if test_execute; then
    904       echo "if1of (\$(KBUILD_TARGET),darwin freebsd haiku linux)" >> $CNF
     1065      echo "if1of (\$(KBUILD_TARGET),darwin freebsd haiku linux os2)" >> $CNF
    9051066      cnf_append " SDK_VBOX_ZLIB_LIBS" "`strip_l "$LIBZ"`"
    9061067      cnf_append " SDK_VBOX_ZLIB_INCS" "$INCZ"
    9071068      echo "endif" >> $CNF
    … …  
    10931254      log_failure "SDL framework not found"
    10941255      fail
    10951256    fi
     1257  elif [ "$OS" = "os2" -a -d "${LIBSDL2}" ]; then
     1258    FLGSDL="-I${LIBSDL2}/include/SDL"
     1259    INCSDL="$FLGSDL"
     1260    LIBSDL="-L${LIBSDL2}/lib -lSDL12"
     1261    LIBSDLMAIN=""
     1262    FLDSDL=""
     1263    WITH_X11=0
     1264    foundsdl=1
    10961265  else
    10971266    if which_wrapper sdl-config > /dev/null; then
    10981267      FLGSDL=`sdl-config --cflags`
    … …  
    11261295    [ -n "$INCSDL" ] && I_INCSDL=`prefix_I "$INCSDL"`
    11271296    if test_compile "$LIBSDL $LIBSDLMAIN $I_INCSDL $FLDSDL" SDL SDL; then
    11281297      if test_execute; then
     1298        if [ -d "${LIBSDL2}" ]; then
     1299          cnf_append "PATH_SDK_LIBSDL"      "${LIBSDL2}"
     1300        fi
    11291301        cnf_append "LIB_SDK_LIBSDL_SDL"     "`strip_l "$LIBSDL"`"
    1130         cnf_append "SDK_LIBSDL_LIBPATH"     "`strip_L "$LIBSDL"`"
    1131         cnf_append "LIB_SDK_LIBSDL_SDLMAIN" "`strip_l "$LIBSDLMAIN"`"
     1302        cnf_append "# SDK_LIBSDL_LIBPATH"     "`strip_L "$LIBSDL"`"
     1303        cnf_append "# LIB_SDK_LIBSDL_SDLMAIN" "`strip_l "$LIBSDLMAIN"`"
    11321304        [ -n "$INCSDL" ] && cnf_append "SDK_LIBSDL_INCS"    "$INCSDL"
    11331305        [ -n "$FLDSDL" ] && cnf_append "SDK_LIBSDL_LDFLAGS" "$FLDSDL"
    11341306      fi
    … …  
    15131685extern "C" int main(void)
    15141686{
    15151687  printf("found version %s", QT_VERSION_STR);
    1516 #if QT_VERSION >= 0x040800
     1688//#if QT_VERSION >= 0x040800
     1689#if QT_VERSION >= 0x040700
    15171690  printf(", OK.\n");
    15181691  return 0;
    15191692#else
    1520   printf(", expected version 4.8.0 or higher\n");
     1693  printf(", expected version 4.7.0 or higher\n");
    15211694  return 1;
    15221695#endif
    15231696}
    … …  
    15261699        INCQT4="$q/include $q/include/QtCore"
    15271700        FLGQT4="-DQT_SHARED"
    15281701        I_INCQT4=`prefix_I "$INCQT4"`
     1702        LIBQT4="-L$q/lib -lQtCore4"
     1703        if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
     1704          foundqt4=3
     1705          break;
     1706        fi
    15291707        LIBQT4="-L$q/lib -lQtCoreVBox"
    15301708        if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
    15311709          foundqt4=2
    … …  
    15461724extern "C" int main(void)
    15471725{
    15481726  printf("found version %s", QT_VERSION_STR);
    1549 #if QT_VERSION >= 0x040800
     1727//#if QT_VERSION >= 0x040800
     1728#if QT_VERSION >= 0x040700
    15501729  printf(", OK.\n");
    15511730  return 0;
    15521731#else
    1553   printf(", expected version 4.8.0 or higher\n");
     1732  //printf(", expected version 4.8.0 or higher\n");
     1733  printf(", expected version 4.7.0 or higher\n");
    15541734  return 1;
    15551735#endif
    15561736}
    … …  
    17691949#
    17701950check_kbuild()
    17711951{
    1772   test_header kBuild
    1773   if which_wrapper "$KBUILDDIR/bin/$OS.$BUILD_MACHINE/kmk" > /dev/null; then
    1774     KBUILDDIR_BIN="$KBUILDDIR/bin/$OS.$BUILD_MACHINE"
     1952    test_header kBuild
     1953    # a current working directory
     1954    wd=`pwd`
     1955
     1956    if which_wrapper "$KBUILDDIR/bin/$OS.$BUILD_MACHINE/kmk" > /dev/null; then
     1957      # binaries in a subdirectory of sources
     1958      KBUILDDIR_BIN="$KBUILDDIR/bin/${OS}.${BUILD_MACHINE}"
     1959    elif check_avail "kmk" KBUILDDIR really; then
     1960      # a KBUILDDIR="/usr/share/kbuild" case, not `pwd`/kBuild
     1961      KBUILDDIR="/usr/share/kbuild"
     1962      # binaries in /usr/bin
     1963      KBUILDDIR_BIN="/usr/bin"
     1964    else
     1965      fail
     1966    fi
     1967
    17751968    echo "PATH_KBUILD=\"`cd $KBUILDDIR ; pwd`\"" >> $ENV
    17761969    echo "export PATH_KBUILD" >> $ENV
    17771970    echo "PATH_DEVTOOLS=\"$DEVDIR\"" >> $ENV
    17781971    echo "export PATH_DEVTOOLS" >> $ENV
    1779     echo "path_kbuild_bin=\"\$PATH_KBUILD/bin/\$BUILD_TARGET.\$BUILD_PLATFORM_ARCH\"" >> $ENV
    1780     echo "export PATH_KBUILD_BIN" >> $ENV
    1781     echo "path_dev_bin=\"\$PATH_DEVTOOLS/\$BUILD_TARGET.\$BUILD_PLATFORM_ARCH\"/bin" >> $ENV
    1782     if [ "$OS" = "solaris" ]; then
     1972
     1973    KBUILD_SED="${KBUILDDIR_BIN}/kmk_sed"
     1974
     1975    if [ "$OS" = "os2" ]; then
     1976      echo "path_kbuild_bin=`echo \"\${KBUILDDIR_BIN}\" | sed -e 's,\/,\\\\\\\\,g'`" >> $ENV
     1977      echo "PATH_KBUILD_BIN=\"\${path_kbuild_bin}\"" >> $ENV
     1978      echo "export PATH_KBUILD_BIN" >> $ENV
     1979      path_dev_bin_x=`echo "${DEVDIR}/${OS}.${BUILD_MACHINE}/bin" | sed -e 's,\/,\\\\\\\\,g'`
     1980      echo "path_dev_bin=\"${path_dev_bin_x}\"" >> $ENV
     1981      path_out_dir_x=`echo "${wd}/out/${OS}.${BUILD_MACHINE}/${BUILD_TYPE}" | sed -e 's,\/,\\\\\\\\,g'`
     1982      echo "path_out_dir=\"${path_out_dir_x}\"" >> $ENV
     1983      path_out_bin_x=`echo "${path_out_dir_x}/bin" | sed -e 's,\/,\\\\\\\\,g'`
     1984      echo "path_out_bin=\"${path_out_bin_x}\"" >> $ENV
     1985      path_bin_x=`echo "${UNIXROOT}/usr/bin" | sed -e 's,\/,\\\\\\\\,g'`
     1986      echo "path_bin=\"${path_bin_x}\"" >> $ENV
     1987      path_gcc_bin_x=`echo "${GCC_DIR}/usr/i386-pc-os2-emx/bin;${GCC_DIR}/usr/bin" | sed -e 's,\/,\\\\\\\\,g'`
     1988      echo "path_gcc_bin=\"${path_gcc_bin_x}\"" >> $ENV
     1989    else
     1990      echo "path_kbuild_bin=`echo \"\${KBUILDDIR_BIN}\"`" >> $ENV
     1991      echo "PATH_KBUILD_BIN=\"\${path_kbuild_bin}\"" >> $ENV
     1992      echo "export PATH_KBUILD_BIN" >> $ENV
     1993      echo "path_dev_bin=\"\$PATH_DEVTOOLS/\$BUILD_TARGET.\$BUILD_PLATFORM_ARCH\"/bin" >> $ENV
     1994    fi
     1995
     1996    # PATH setting
     1997    if [ "$OS" = "os2" ]; then
     1998      echo "echo \"\$PATH\" | sed -e 's,\\\\\\\\,/,g' | grep -q \"\$path_bin\" || PATH=\"\$path_bin;\$PATH\"" >> $ENV
     1999      echo "echo \"\$PATH\" | sed -e 's,\\\\\\\\,/,g' | grep -q \"\$path_kbuild_bin\" || PATH=\"\$path_kbuild_bin;\$PATH\"" >> $ENV
     2000      echo "echo \"\$PATH\" | sed -e 's,\\\\\\\\,/,g' | grep -q \"\$path_gcc_bin\" || PATH=\"\$path_gcc_bin;\$PATH\"" >> $ENV
     2001      echo "echo \"\$PATH\" | sed -e 's,\\\\\\\\,/,g' | grep -q \"\$path_dev_bin\" || PATH=\"\$path_dev_bin;\$PATH\"" >> $ENV
     2002      echo "echo \"\$PATH\" | sed -e 's,\\\\\\\\,/,g' | grep -q \"\$path_out_bin\" || PATH=\"\$path_out_bin;\$PATH\"" >> $ENV
     2003      echo "export PATH" >> $ENV
     2004      echo "unset path_dev_bin_x path_out_bin_x path_out_dir_x \
     2005                path_kbuild_bin path_dev_bin path_out_bin path_out_dir" >> $ENV
     2006    elif [ "$OS" = "solaris" ]; then
    17832007      # Because of sh being non-default shell in Solaris we need to export PATH again when
    17842008      # sourcing env.sh. Simply exporting from ./configure does not export PATH correctly.
    17852009      echo "PATH=\"$ORGPATH\"" >> $ENV
    17862010      echo "echo \"\$PATH\" | /usr/sfw/bin/ggrep -q \"\$path_kbuild_bin\" || PATH=\"\$path_kbuild_bin:\$PATH\"" >> $ENV
    17872011      echo "echo \"\$PATH\" | /usr/sfw/bin/ggrep -q \"\$path_dev_bin\" || PATH=\"\$path_dev_bin:\$PATH\"" >> $ENV
    1788     else
     2012      echo "export PATH" >> $ENV
     2013      echo "unset path_kbuild_bin path_dev_bin" >> $ENV
     2014    elif [ "$OS.$BUILD_MACHINE" = "darwin.amd64" ]; then
     2015      # Currently there are no amd64 kBuild bins. So use the x86 variant in any case.
     2016      KBUILDDIR_BIN="$KBUILDDIR/bin/$OS.x86"
     2017      echo "PATH_KBUILD=\"`cd $KBUILDDIR ; pwd`\"" >> $ENV
     2018      echo "export PATH_KBUILD" >> $ENV
     2019      echo "PATH_DEVTOOLS=\"$DEVDIR\"" >> $ENV
     2020      echo "export PATH_DEVTOOLS" >> $ENV
     2021      echo "path_kbuild_bin=\"\$PATH_KBUILD/bin/\$BUILD_TARGET.x86\"" >> $ENV
     2022      echo "PATH_KBUILD_BIN=\"\$path_kbuild_bin\"" >> $ENV
     2023      echo "export PATH_KBUILD_BIN" >> $ENV
     2024      echo "path_dev_bin=\"\$PATH_DEVTOOLS/\$BUILD_TARGET.\$BUILD_PLATFORM_ARCH\"/bin" >> $ENV
    17892025      echo "echo \"\$PATH\" | grep -q \"\$path_kbuild_bin\" || PATH=\"\$path_kbuild_bin:\$PATH\"" >> $ENV
    17902026      echo "echo \"\$PATH\" | grep -q \"\$path_dev_bin\" || PATH=\"\$path_dev_bin:\$PATH\"" >> $ENV
     2027      echo "export PATH" >> $ENV
     2028      echo "unset path_kbuild_bin path_dev_bin" >> $ENV
     2029      KBUILD_SED="$KBUILDDIR_BIN/kmk_sed"
    17912030    fi
    1792     echo "export PATH" >> $ENV
    1793     echo "unset path_kbuild_bin path_dev_bin" >> $ENV
    1794     KBUILD_SED="$KBUILDDIR_BIN/kmk_sed"
    1795   elif [ "$OS.$BUILD_MACHINE" = "darwin.amd64" ]; then
    1796     # Currently there are no amd64 kBuild bins. So use the x86 variant in any case.
    1797     KBUILDDIR_BIN="$KBUILDDIR/bin/$OS.x86"
    1798     echo "PATH_KBUILD=\"`cd $KBUILDDIR ; pwd`\"" >> $ENV
    1799     echo "export PATH_KBUILD" >> $ENV
    1800     echo "PATH_DEVTOOLS=\"$DEVDIR\"" >> $ENV
    1801     echo "export PATH_DEVTOOLS" >> $ENV
    1802     echo "path_kbuild_bin=\"\$PATH_KBUILD/bin/\$BUILD_TARGET.x86\"" >> $ENV
    1803     echo "PATH_KBUILD_BIN=\"\$path_kbuild_bin\"" >> $ENV
    1804     echo "export PATH_KBUILD_BIN" >> $ENV
    1805     echo "path_dev_bin=\"\$PATH_DEVTOOLS/\$BUILD_TARGET.\$BUILD_PLATFORM_ARCH\"/bin" >> $ENV
    1806     echo "echo \"\$PATH\" | grep -q \"\$path_kbuild_bin\" || PATH=\"\$path_kbuild_bin:\$PATH\"" >> $ENV
    1807     echo "echo \"\$PATH\" | grep -q \"\$path_dev_bin\" || PATH=\"\$path_dev_bin:\$PATH\"" >> $ENV
    1808     echo "export PATH" >> $ENV
    1809     echo "unset path_kbuild_bin path_dev_bin" >> $ENV
    1810     KBUILD_SED="$KBUILDDIR_BIN/kmk_sed"
    1811   elif check_avail "kmk" KBUILDDIR really; then
    1812     # check for installed kBuild
    1813     KBUILD_SED="`which_wrapper kmk_sed`"
    1814   else
    1815     fail
    1816   fi
    1817   log_success "found"
     2031    log_success "found"
    18182032}
    18192033
    18202034
    … …  
    19492163        echo "compiling the following source file:" >> $LOG
    19502164        cat $ODIR.tmp_src.cc >> $LOG
    19512165        echo "using the following command line:" >> $LOG
    1952         echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so" >> $LOG
    1953         $CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so >> $LOG 2>&1
     2166        if [ "$OS" = "os2" ]; then
     2167          echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc $CXX_FLAGS -I$p/include/$d $p/$b/${d}_dll.lib" >> $LOG
     2168          $CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc $CXX_FLAGS -I$p/include/$d $p/$b/${d}_dll.lib >> $LOG 2>&1
     2169        else
     2170          echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc $CXX_FLAGS -I$p/include/$d $p/$b/lib$d.so" >> $LOG
     2171          $CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc $CXX_FLAGS -I$p/include/$d $p/$b/lib$d.so >> $LOG 2>&1
     2172        fi
    19542173        if [ $? -eq 0 ]; then
    19552174          found=1
    19562175          break
    … …  
    19642183    if test_execute; then
    19652184      cnf_append "VBOX_WITH_PYTHON"     "1"
    19662185      cnf_append "VBOX_PATH_PYTHON_INC" "$p/include/$d"
    1967       cnf_append "VBOX_LIB_PYTHON"      "$p/$b/lib$d.so"
     2186      if [ "$OS" = "os2" ]; then
     2187        cnf_append "VBOX_LIB_PYTHON"      "$p/$b/${d}_dll.lib"
     2188      else
     2189        cnf_append "VBOX_LIB_PYTHON"      "$p/$b/lib$d.so"
     2190      fi
    19682191    else
    19692192      log_failure "Python not working"
    19702193      fail