Skip to content

fix: resolve race condition in nsld.sh with parallel linker invocations #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NathanWalker wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −16
Open

fix: resolve race condition in nsld.sh with parallel linker invocations #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions project-template-ios/internal/nsld.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
#!/usr/bin/env bash
source ./.build_env_vars.sh

MODULES_DIR="$SRCROOT/internal/Swift-Modules"

function DELETE_SWIFT_MODULES_DIR() {
rm -rf "$MODULES_DIR"
}

function getArch() {
while [[ $# -gt 0 ]]
do
Expand All @@ -24,6 +18,16 @@ function getArch() {
done
}

# Workaround for ARCH being set to `undefined_arch` here. Extract it from command line arguments.
TARGET_ARCH=$(getArch "$@")

# Use per-architecture directory to avoid race conditions with parallel linker invocations
MODULES_DIR="$SRCROOT/internal/Swift-Modules-$TARGET_ARCH"

function DELETE_SWIFT_MODULES_DIR() {
rm -rf "$MODULES_DIR"
}

function GEN_MODULEMAP() {
ARCH_ARG=$1
SWIFT_HEADER_DIR=$PER_VARIANT_OBJECT_FILE_DIR/$ARCH_ARG
Expand Down Expand Up @@ -52,9 +56,8 @@ function GEN_METADATA() {
popd
}

# Workaround for ARCH being set to `undefined_arch` here. Extract it from command line arguments.
TARGET_ARCH=$(getArch "$@")
GEN_MODULEMAP $TARGET_ARCH
export HEADER_SEARCH_PATHS="$HEADER_SEARCH_PATHS $MODULES_DIR"
printf "Generating metadata..."
GEN_METADATA $TARGET_ARCH
DELETE_SWIFT_MODULES_DIR
Expand Down
19 changes: 11 additions & 8 deletions project-template-vision/internal/nsld.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
#!/usr/bin/env bash
source ./.build_env_vars.sh

MODULES_DIR="$SRCROOT/internal/Swift-Modules"

function DELETE_SWIFT_MODULES_DIR() {
rm -rf "$MODULES_DIR"
}

function getArch() {
while [[ $# -gt 0 ]]
do
Expand All @@ -24,6 +18,16 @@ function getArch() {
done
}

# Workaround for ARCH being set to `undefined_arch` here. Extract it from command line arguments.
TARGET_ARCH=$(getArch "$@")

# Use per-architecture directory to avoid race conditions with parallel linker invocations
MODULES_DIR="$SRCROOT/internal/Swift-Modules-$TARGET_ARCH"

function DELETE_SWIFT_MODULES_DIR() {
rm -rf "$MODULES_DIR"
}

function GEN_MODULEMAP() {
ARCH_ARG=$1
SWIFT_HEADER_DIR=$PER_VARIANT_OBJECT_FILE_DIR/$ARCH_ARG
Expand Down Expand Up @@ -52,9 +56,8 @@ function GEN_METADATA() {
popd
}

# Workaround for ARCH being set to `undefined_arch` here. Extract it from command line arguments.
TARGET_ARCH=$(getArch "$@")
GEN_MODULEMAP $TARGET_ARCH
export HEADER_SEARCH_PATHS="$HEADER_SEARCH_PATHS $MODULES_DIR"
printf "Generating metadata..."
GEN_METADATA $TARGET_ARCH
DELETE_SWIFT_MODULES_DIR
Expand Down
Loading