Check-in [df5accddbb]
Overview
Comment:Give it another try. Mac builds are cross-compilations
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:df5accddbba43b93ff9eee5f210eeec66452936e
User & Date: ssoberni on 2015-10-23 20:43:59
Other Links: manifest | tags
Context
2015-10-23
21:38
Third attempt: Provide a Tcl 8.4 wrapper, tested using tclsh8.4 as TCLSH_NATIVE check-in: dca99d9485 user: ssoberni tags: trunk
20:43
Give it another try. Mac builds are cross-compilations check-in: df5accddbb user: ssoberni tags: trunk
20:09
Use TCLSH_NATIVE only when cross-compiling (as indicated by KC_CROSSCOMPILE) check-in: 40706ce9b4 user: ssoberni tags: trunk
Changes

Modified nsf/build.sh from [756d463b89] to [007052aec1].

   101    101   	rm -f configure.new
   102    102   	
   103    103   	(
   104    104   	    # Build
   105    105   	    echo "Running: ./configure $tryopt --disable-symbols --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
   106    106   	    ./configure $tryopt --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
   107    107   
   108         -	    if [ "${KC_CROSSCOMPILE}" = '1' ]; then
   109         -                ## Cross-compiling, use TCLSH_NATIVE
   110         -		echo "Running: ${MAKE:-make} TCLSH=${TCLSH_NATIVE}"
   111         -		${MAKE:-make} TCLSH=${TCLSH_NATIVE} || exit 1
   112         -		
   113         -		echo "Running: ${MAKE:-make} install TCLSH=${TCLSH_NATIVE}"
   114         -		${MAKE:-make} install TCLSH=${TCLSH_NATIVE} || exit 1
   115         -	    else
   116    108   		echo "Running: ${MAKE:-make}"
   117    109   		${MAKE:-make} || exit 1
   118    110   		
   119    111   		echo "Running: ${MAKE:-make} install"
   120         -		${MAKE:-make} install || exit 1
   121         -            fi
   122         -	    
          112  +	    ${MAKE:-make} install || (
          113  +		## cross-compiling? use TCLSH_NATIVE
          114  +		echo "Running: ${MAKE:-make} install TCLSH=${TCLSH_NATIVE}"
          115  +		${MAKE:-make} install TCLSH=${TCLSH_NATIVE} || exit 1
          116  +	    ) || exit 1
   123    117   	) || continue
   124    118   	
   125    119   	break
   126    120       done
   127    121       
   128    122       mkdir "${OUTDIR}/lib" || exit 1
   129    123       cp -r "${INSTDIR}/lib"/nsf*/serialize "${OUTDIR}/lib/nsf${NSFVERS}-serialize"