Diff for /elwix/build_world.sh between versions 1.5 and 1.7.2.1

version 1.5, 2017/02/13 16:52:46 version 1.7.2.1, 2021/09/08 12:07:28
Line 38  if [ "${USER}" != "root" ]; then Line 38  if [ "${USER}" != "root" ]; then
 fi  fi
   
 # Set TARGET_CPUTYPE only for world compiling. Don't use this in kernel build!  # Set TARGET_CPUTYPE only for world compiling. Don't use this in kernel build!
X_TARGET_CPUTYPE="TARGET_CPUTYPE=${TARGET_CPUTYPE}"[ -n "${TARGET_CPUTYPE}" ] && X_TARGET_CPUTYPE="TARGET_CPUTYPE=${TARGET_CPUTYPE}"
   
 clean_world()  clean_world()
 {  {
Line 111  build_cross() Line 111  build_cross()
 export \\  export \\
 _EOF  _EOF
         env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \          env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
                buildenvvars >> ${CENV}                WORLDTMP=${WORLD} buildenvvars >> ${CENV}
         cat >>${CENV} <<_EOF          cat >>${CENV} <<_EOF
 PATH=$WORLD/elwix/pkg/bin:$WORLD/elwix/pkg/sbin:/elwix/pkg/bin:/elwix/pkg/sbin:$PKG/bin:$PKG/sbin:\$PATH:$PATH  PATH=$WORLD/elwix/pkg/bin:$WORLD/elwix/pkg/sbin:/elwix/pkg/bin:/elwix/pkg/sbin:$PKG/bin:$PKG/sbin:\$PATH:$PATH
   
Line 119  if [ -n "\${REPLACE_MAKEOBJDIRPREFIX}" ]; then Line 119  if [ -n "\${REPLACE_MAKEOBJDIRPREFIX}" ]; then
         MAKEOBJDIRPREFIX="\${REPLACE_MAKEOBJDIRPREFIX}"          MAKEOBJDIRPREFIX="\${REPLACE_MAKEOBJDIRPREFIX}"
 fi  fi
   
   export CROSS_WORLD=$WORLD
   export CFLAGS="\$CFLAGS -I\${CROSS_WORLD}/usr/include"
   export LDFLAGS="\$LDFLAGS -L\${CROSS_WORLD}/lib -L\${CROSS_WORLD}/usr/lib"
   
 _EOF  _EOF
         cd -          cd -
         cp ${CENV} ${CBUILD}          cp ${CENV} ${CBUILD}
Line 141  _EOF Line 145  _EOF
 }  }
   
 ### main()  ### main()
   if [ -n "${1}" ]; then
           rm ${WORLD}/elwix.ver
   fi
   
 if ! SnitVer ${WORLD}/elwix.ver; then  if ! SnitVer ${WORLD}/elwix.ver; then
         if [ -z "$1" ]; then          if [ -z "$1" ]; then
                 clean_world                  clean_world

Removed from v.1.5  
changed lines
  Added in v.1.7.2.1


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>