From 18b6bf3cf8f377b2f084ed7b3551b5c831e17bb1 Mon Sep 17 00:00:00 2001 From: tydeu Date: Tue, 7 Jun 2022 21:27:41 -0400 Subject: [PATCH] fix: exe link args & targets test --- Lake/Build/Binary.lean | 2 +- examples/targets/test.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Lake/Build/Binary.lean b/Lake/Build/Binary.lean index b6a7d20f37..af3966b282 100644 --- a/Lake/Build/Binary.lean +++ b/Lake/Build/Binary.lean @@ -93,7 +93,7 @@ def Package.mkExeTarget (self : Package) (exe : LeanExeConfig) : FileTarget := let rootTarget := moduleTargetMap.find? exe.root |>.get! let rootLinkTarget := self.oFileTargetOf exe.root rootTarget #[rootLinkTarget] ++ pkgLinkTargets - let target := leanBinTarget exeFile linkTargets exe.moreLinkArgs + let target := leanBinTarget exeFile linkTargets exe.linkArgs target.materializeAsync protected def Package.exeTarget (self : Package) : FileTarget := diff --git a/examples/targets/test.sh b/examples/targets/test.sh index 8da3d31dbf..7cbc6d6bfa 100755 --- a/examples/targets/test.sh +++ b/examples/targets/test.sh @@ -1,17 +1,17 @@ set -e -if [ "$OS" = Windows_NT ]; then -SHARED_LIB_EXT=dll -elif [ `shell uname -s` = Darwin ]; then -SHARED_LIB_EXT=dylib -else -SHARED_LIB_EXT=so -fi - LAKE=${LAKE:-../../build/bin/lake} set -x +if [ "$OS" = Windows_NT ]; then +SHARED_LIB_EXT=dll +elif [ "`uname`" = Darwin ]; then +SHARED_LIB_EXT=dylib +else +SHARED_LIB_EXT=so +fi + ./clean.sh $LAKE build +Baz