summaryrefslogtreecommitdiff
path: root/lang/mlton/files/add-local-cross
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2014-03-07 17:57:07 +0000
committerRene Ladan <rene@FreeBSD.org>2014-03-07 17:57:07 +0000
commit79a9ce05532093c0d7746faca6049f205f22edd9 (patch)
tree29991df9b0d6cdde4192b688ea75c63524eb4a9f /lang/mlton/files/add-local-cross
parentFix to use proper zip arg (diff)
Bring lang/mlton back into shape.
From the PR submitter: - Update to 20100608 - Support amd64 natively - Update DISTFILES location to use Sourceforge - Add LICENSE_FILE - Ensure add-local-cross script is executable - Clean up old patches, replace trivial patches by REINPLACE_CMD - Mark SMLNJ option as broken for now. - Mark jobs unsafe. From myself: - Unexpire. - Add stage support - Add USE_GCC=any - Convert to USES - New LIB_DEPENDS format - Remove pre-FreeBSD 7.0 compatibility - Pass maintainership to submitter PR: ports/177406 Submitted by: Timothy Beyer <beyert@cs.ucr.edu> Approved by: previous maintainer timeout (11 months)
Notes
Notes: svn path=/head/; revision=347412
Diffstat (limited to 'lang/mlton/files/add-local-cross')
-rw-r--r--lang/mlton/files/add-local-cross18
1 files changed, 6 insertions, 12 deletions
diff --git a/lang/mlton/files/add-local-cross b/lang/mlton/files/add-local-cross
index 01bc3ef4d942..c76d482ddd5c 100644
--- a/lang/mlton/files/add-local-cross
+++ b/lang/mlton/files/add-local-cross
@@ -101,24 +101,19 @@ $MAKE -C runtime COMPILE_FAST=yes OMIT_BYTECODE=yes TARGET=$crossTarget \
echo "* Running make dirs runtime in $tmp."
$MAKE TARGET=$crossTarget TARGET_ARCH=$crossArch TARGET_OS=$crossOS dirs runtime
-echo "* Copy from tmp to build (build/lib/$crossTarget)."
+echo "* Copy from tmp to build (build/lib/targets/$crossTarget)."
# ssh $machine "cd $tmp/build/lib/self && tar cf - ." |
# ( cd "$lib/$crossTarget" && tar xf - )
-cp -pfR "$tmp/build/lib/$crossTarget" "$lib/"
+mkdir -p "$lib/targets"
+cp -pfR "$tmp/build/lib/targets/$crossTarget" "$lib/targets/"
-echo "* Copy from $crossArch-$crossOS (basis-library/config/c/$crossArch-crossOS)."
-#ssh $machine "cd $tmp/basis-library/config/c && tar cf - $crossArch-$crossOS" |
-# ( cd "$lib/sml/basis/config/c" && tar xf - )
-cp -pfR "$tmp/basis-library/config/c/$crossArch-$crossOS" \
- "$lib/sml/basis/config/c/"
-
-echo "* Running make mlbpathmap targetmap in $src."
+echo "* Running make mlbpathmap in $src."
#( cd "$src" &&
# mmake TARGET=$crossTarget TARGET_ARCH=$crossArch TARGET_OS=$crossOS \
# mlbpathmap targetmap )
cd "$src"
$MAKE TARGET=$crossTarget TARGET_ARCH=$crossArch TARGET_OS=$crossOS \
- mlbpathmap targetmap
+ mlbpathmap
case "$crossOS" in
mingw)
@@ -191,7 +186,6 @@ cd "$tmp/runtime/"
$GCC $archOpts $osOpts -I. -o $exe $exe.c libmlton.a libgdtoa.a -lgmp -lm $libs
#ssh $machine "$tmp/runtime/$exe$suf" >"$lib/$crossTarget/constants"
-$RUN "$tmp/runtime/$exe$suf" > "$lib/$crossTarget/constants"
+$RUN "$tmp/runtime/$exe$suf" > "$lib/targets/$crossTarget/constants"
#ssh $machine "rm -rf $tmp"
# rm -rf "$tmp"
-