Home My Page Projects Code Snippets Project Openings SML/NJ
Summary Activity Forums Tracker Lists Tasks Docs Surveys News SCM Files

SCM Repository

[smlnj] Diff of /config/trunk/install.sh
ViewVC logotype

Diff of /config/trunk/install.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 4904, Fri Dec 21 21:18:55 2018 UTC revision 4905, Fri Dec 21 21:55:13 2018 UTC
# Line 215  Line 215 
215  #   BINDIR, and VERSION variables to use.  #   BINDIR, and VERSION variables to use.
216  #  #
217  installdriver() {  installdriver() {
218        echo "$this: installing $BINDIR/$2"
219      dsrc=$1      dsrc=$1
220      ddst=$2      ddst=$2
221  # We install the driver unconditionally. (It would be better to test  # We install the driver unconditionally. (It would be better to test
# Line 252  Line 253 
253      case `uname -s` in      case `uname -s` in
254        CYGWIN*)        CYGWIN*)
255          echo "$this: !!! SML/NJ does not support 64-bit cygwin"          echo "$this: !!! SML/NJ does not support 64-bit cygwin"
256          echo :$this: !!! Please use the 32-bit version"          echo "$this: !!! Please use the 32-bit version"
257          ;;          ;;
258        *)        *)
259          echo "$this: !!! Script $BINDIR/.arch-n-opsys fails on this machine."          echo "$this: !!! Script $BINDIR/.arch-n-opsys fails on this machine."
# Line 301  Line 302 
302  RT_MAKEFILE=mk.$ARCH-$OPSYS  RT_MAKEFILE=mk.$ARCH-$OPSYS
303  case $OPSYS in  case $OPSYS in
304      darwin)      darwin)
305        SDK=none
306          if [ "$ARCH" = "x86" ] ; then          if [ "$ARCH" = "x86" ] ; then
307              # the /usr/bin/as command does _not_ accept the -mmacosx-version-min              # the /usr/bin/as command does _not_ accept the -mmacosx-version-min
308              # command-line option prior to MacOS X 10.10 (Yosemite)              # command-line option prior to MacOS X 10.10 (Yosemite)
# Line 312  Line 314 
314                10.14*) # Mojave needs a special makefile                10.14*) # Mojave needs a special makefile
315                  AS_ACCEPTS_SDK=yes                  AS_ACCEPTS_SDK=yes
316                  RT_MAKEFILE=mk.x86-darwin18                  RT_MAKEFILE=mk.x86-darwin18
317              # location of Xcode SDKs
318              SDK_DIR=`xcode-select -p`/Platforms/MacOSX.platform/Developer/SDKs/
319              # look for an SDK that supports 32-bit builds (starting with 10.13 High Sierra
320              # and going back to 10.10 Yosemite)
321              #
322              for SDK_VERS in 13 12 11 10 ; do
323                if [ -d $SDK_DIR/MacOSX10.$SDK_VERS.sdk ] ; then
324                  SDK="$SDK_DIR/MacOSX10.$SDK_VERS.sdk"
325                  break
326                fi
327              done
328              if [ x"$SDK" = xnone ] ; then
329                echo "$this: !!! SML/NJ requires support for 32-bit executables."
330                echo "  Please see http://www.smlnj.org/dist/working/$VERSION/INSTALL for more details."
331                exit 1
332              fi
333                  ;;                  ;;
334                *) AS_ACCEPTS_SDK=yes ;;                *) AS_ACCEPTS_SDK=yes ;;
335              esac              esac
336          if [ x"$SDK" = xnone ] ; then
337          EXTRA_DEFS="AS_ACCEPTS_SDK=$AS_ACCEPTS_SDK"          EXTRA_DEFS="AS_ACCEPTS_SDK=$AS_ACCEPTS_SDK"
338          else
339            EXTRA_DEFS="AS_ACCEPTS_SDK=$AS_ACCEPTS_SDK SDK=$SDK"
340          fi
341          fi          fi
342          ;;          ;;
343      linux)      linux)
# Line 324  Line 346 
346              complain "$this: !!! Problems checking for underscores in asm names."              complain "$this: !!! Problems checking for underscores in asm names."
347          fi          fi
348          EXTRA_DEFS="XDEFS=$EXTRA_DEFS"          EXTRA_DEFS="XDEFS=$EXTRA_DEFS"
349          ;;      if [ "$ARCH" = "x86" ] ; then
     solaris)  
         MAKE=/usr/ccs/bin/make  
         ;;  
 esac  
   
350  #  #
351  # on 64-bit linux systems, we need to check to see if the 32-bit emulation  # on 64-bit linux systems, we need to check to see if the 32-bit emulation
352  # support is installed  # support is installed
353  #  #
 if [ x"$ARCH" = "xx86" -a x"$OPSYS" = "xlinux" ] ; then  
354    case `uname -m` in    case `uname -m` in
355      x86_64)      x86_64)
356        tmpFile=smlnj-test$$        tmpFile=smlnj-test$$
# Line 343  Line 359 
359        if [ "$?" != "0" ] ; then        if [ "$?" != "0" ] ; then
360          rm -f /tmp/$tmpFile /tmp/$tmpFile.c          rm -f /tmp/$tmpFile /tmp/$tmpFile.c
361          echo "$this: !!! SML/NJ requires support for 32-bit executables."          echo "$this: !!! SML/NJ requires support for 32-bit executables."
362          echo "  Please see http://www.smlnj.org/dist/working/$VERSION/INSTALL for more details."              echo "$this: !!! Please see http://www.smlnj.org/dist/working/$VERSION/INSTALL for more details."
363          exit 1          exit 1
364        else        else
365          rm -f /tmp/$tmpFile /tmp/$tmpFile.c          rm -f /tmp/$tmpFile /tmp/$tmpFile.c
# Line 352  Line 368 
368      *) ;;      *) ;;
369    esac    esac
370  fi  fi
371        ;;
372      solaris)
373        MAKE=/usr/ccs/bin/make
374        ;;
375    esac
376    
377  #  #
378  # the name of the bin files directory  # the name of the bin files directory

Legend:
Removed from v.4904  
changed lines
  Added in v.4905

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0