make/devkit/createSolarisDevkit.sh
changeset 34606 83c270cae5e1
parent 34595 09596fe63e2d
child 48909 54b423e1c4cf
equal deleted inserted replaced
34605:60c12f0860d6 34606:83c270cae5e1
    94 
    94 
    95 if [ ! -d $SYSROOT ]; then
    95 if [ ! -d $SYSROOT ]; then
    96   echo "Copying from $INSTALL_ROOT to $SYSROOT"
    96   echo "Copying from $INSTALL_ROOT to $SYSROOT"
    97   mkdir -p $SYSROOT
    97   mkdir -p $SYSROOT
    98   cp -rH $INSTALL_ROOT/lib $SYSROOT/
    98   cp -rH $INSTALL_ROOT/lib $SYSROOT/
    99   mkdir $SYSROOT/usr
    99   mkdir $SYSROOT/usr $DEVKIT_ROOT/gnu
   100   # Some of the tools in sysroot are needed in the OpenJDK build but cannot be
   100   # Some of the tools in sysroot are needed in the OpenJDK build but cannot be
   101   # run from their current location due to relative runtime paths in the
   101   # run from their current location due to relative runtime paths in the
   102   # binaries. Move the sysroot/usr/bin directory to the outer bin and have them
   102   # binaries. Move the sysroot/usr/bin directory to the outer bin and have them
   103   # be runnable from there to force them to link to the system libraries
   103   # be runnable from there to force them to link to the system libraries
   104   cp -rH $INSTALL_ROOT/usr/bin $DEVKIT_ROOT
   104   cp -rH $INSTALL_ROOT/usr/bin $DEVKIT_ROOT
       
   105   cp -rH $INSTALL_ROOT/usr/gnu/bin $DEVKIT_ROOT/gnu/
   105   cp -rH $INSTALL_ROOT/usr/lib $SYSROOT/usr/
   106   cp -rH $INSTALL_ROOT/usr/lib $SYSROOT/usr/
   106   cp -rH $INSTALL_ROOT/usr/include $SYSROOT/usr/
   107   cp -rH $INSTALL_ROOT/usr/include $SYSROOT/usr/
   107   pkg -R $INSTALL_ROOT list > $SYSROOT/pkg-list.txt
   108   pkg -R $INSTALL_ROOT list > $SYSROOT/pkg-list.txt
   108 else
   109 else
   109   echo "Skipping copying to $SYSROOT"
   110   echo "Skipping copying to $SYSROOT"