From ce320939e0f894c12912337a72f9f5b414b1f9ce Mon Sep 17 00:00:00 2001 From: Teodor Dermendzhiev Date: Mon, 22 Apr 2019 16:54:39 +0300 Subject: [PATCH 1/2] Add NS_LD variable to be used for alternate linker --- build/project-template/internal/nsld.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/project-template/internal/nsld.sh b/build/project-template/internal/nsld.sh index b8aff55f1..1c402d883 100755 --- a/build/project-template/internal/nsld.sh +++ b/build/project-template/internal/nsld.sh @@ -42,7 +42,8 @@ GEN_MODULEMAP printf "Generating metadata..." GEN_METADATA DELETE_SWIFT_MODULES_DIR -$TOOLCHAIN_DIR/usr/bin/clang $@ +$NS_LD="${NS_LD:-"$TOOLCHAIN_DIR/usr/bin/clang"}" +$NS_LD "$@" From 7b73b61a171528a5b417ec883e0d4e492bc6b807 Mon Sep 17 00:00:00 2001 From: Vasil Trifonov Date: Tue, 7 May 2019 17:23:58 +0300 Subject: [PATCH 2/2] remove wrong starting $ --- build/project-template/internal/nsld.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/project-template/internal/nsld.sh b/build/project-template/internal/nsld.sh index 1c402d883..06a7211b0 100755 --- a/build/project-template/internal/nsld.sh +++ b/build/project-template/internal/nsld.sh @@ -42,7 +42,7 @@ GEN_MODULEMAP printf "Generating metadata..." GEN_METADATA DELETE_SWIFT_MODULES_DIR -$NS_LD="${NS_LD:-"$TOOLCHAIN_DIR/usr/bin/clang"}" +NS_LD="${NS_LD:-"$TOOLCHAIN_DIR/usr/bin/clang"}" $NS_LD "$@"