[BACK]Return to build.sh CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/build.sh between version 1.316 and 1.316.4.2

version 1.316, 2017/04/08 18:22:35 version 1.316.4.2, 2018/02/26 13:52:00
Line 1441  sanitycheck()
Line 1441  sanitycheck()
                 fi                  fi
                 ;;                  ;;
         esac          esac
   
           while [ ${MKX11-no} = "yes" ]; do               # not really a loop
                   test -n "${X11SRCDIR}" && {
                       test -d "${X11SRCDIR}" ||
                           bomb "X11SRCDIR (${X11SRCDIR}) does not exist (with -x)"
                       break
                   }
                   for _xd in \
                       "${NETBSDSRCDIR%/*}/xsrc" \
                       "${NETBSDSRCDIR}/xsrc" \
                       /usr/xsrc
                   do
                       test -d "${_xd}" &&
                           setmakeenv X11SRCDIR "${_xd}" &&
                           break 2
                   done
                   bomb "Asked to build X11 but no xsrc"
           done
 }  }
   
 # print_tooldir_make --  # print_tooldir_make --
 # Try to find and print a path to an existing  # Try to find and print a path to an existing
 # ${TOOLDIR}/bin/${toolprefix}program  # ${TOOLDIR}/bin/${toolprefix}program
Line 1616  rebuildmake()
Line 1635  rebuildmake()
   
         statusmsg "Bootstrapping ${toolprefix}make"          statusmsg "Bootstrapping ${toolprefix}make"
         ${runcmd} cd "${tmpdir}"          ${runcmd} cd "${tmpdir}"
         ${runcmd} env \          ${runcmd} env CC="${HOST_CC-cc}" CPPFLAGS="${HOST_CPPFLAGS}" \
 \                  CFLAGS="${HOST_CFLAGS--O}" LDFLAGS="${HOST_LDFLAGS}" \
 CC="${HOST_CC-cc}" \  
 CPPFLAGS="${HOST_CPPFLAGS} -D_PATH_DEFSYSPATH="'\"'${NETBSDSRCDIR}/share/mk'\"' \  
 CFLAGS="${HOST_CFLAGS--O}" \  
 LDFLAGS="${HOST_LDFLAGS}" \  
 \  
             ${HOST_SH} "${TOP}/tools/make/configure" ||              ${HOST_SH} "${TOP}/tools/make/configure" ||
         ( cp ${tmpdir}/config.log ${tmpdir}-config.log          ( cp ${tmpdir}/config.log ${tmpdir}-config.log
               bomb "Configure of ${toolprefix}make failed, see ${tmpdir}-config.log for details" )                bomb "Configure of ${toolprefix}make failed, see ${tmpdir}-config.log for details" )
Legend:
Removed from v.1.316  
changed lines
  Added in v.1.316.4.2
CVSweb <webmaster@jp.NetBSD.org>