-
Notifications
You must be signed in to change notification settings - Fork 60
fix: build script for macOS development #1491
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.
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
volsa
wants to merge
1
commit into
master
Choose a base branch
from
vosa/build-script-macos
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -246,20 +246,37 @@ function run_package_std() { | |||||||
| cp "$rel_dir/"*.a "$lib_dir" 2>/dev/null || log "$rel_dir does not contain *.a files" | ||||||||
| # Create an SO file from the copied a file | ||||||||
| log "Creating a shared library from the compiled static library" | ||||||||
| log "Running : $cc --shared -L$lib_dir \ | ||||||||
| -Wl,--whole-archive -liec61131std \ | ||||||||
| -o $lib_dir/out.so -Wl,--no-whole-archive \ | ||||||||
| -lm \ | ||||||||
| -fuse-ld=lld \ | ||||||||
| --target=$val" | ||||||||
| $cc --shared -L"$lib_dir" \ | ||||||||
| -Wl,--whole-archive -liec61131std \ | ||||||||
| -o "$lib_dir/out.so" -Wl,--no-whole-archive \ | ||||||||
| -lm \ | ||||||||
| -fuse-ld=lld \ | ||||||||
| --target="$val" | ||||||||
|
|
||||||||
| mv "$lib_dir/out.so" "$lib_dir/libiec61131std.so" | ||||||||
| # Check if we're on macOS and adjust linker flags accordingly | ||||||||
| unameOut="$(uname -s)" | ||||||||
| case "${unameOut}" in | ||||||||
| Darwin*) | ||||||||
| log "Running : $cc --shared -L$lib_dir \ | ||||||||
| -Wl,-force_load,$lib_dir/libiec61131std.a \ | ||||||||
| -o $lib_dir/libiec61131std.so \ | ||||||||
| -lm -framework CoreFoundation \ | ||||||||
| --target=$val" | ||||||||
| $cc --shared -L"$lib_dir" \ | ||||||||
| -Wl,-force_load,"$lib_dir/libiec61131std.a" \ | ||||||||
| -o "$lib_dir/libiec61131std.so" \ | ||||||||
| -lm -framework CoreFoundation \ | ||||||||
| --target="$val" | ||||||||
| ;; | ||||||||
| *) | ||||||||
| log "Running : $cc --shared -L$lib_dir \ | ||||||||
| -Wl,--whole-archive -liec61131std \ | ||||||||
| -o $lib_dir/libiec61131std.so -Wl,--no-whole-archive \ | ||||||||
| -lm \ | ||||||||
| -fuse-ld=lld \ | ||||||||
| --target=$val" | ||||||||
| $cc --shared -L"$lib_dir" \ | ||||||||
| -Wl,--whole-archive -liec61131std \ | ||||||||
| -o "$lib_dir/libiec61131std.so" -Wl,--no-whole-archive \ | ||||||||
| -lm \ | ||||||||
| -fuse-ld=lld \ | ||||||||
| --target="$val" | ||||||||
| ;; | ||||||||
| esac | ||||||||
|
|
||||||||
| done | ||||||||
| else | ||||||||
| lib_dir=$OUTPUT_DIR/lib | ||||||||
|
|
@@ -272,21 +289,36 @@ function run_package_std() { | |||||||
| cp "$rel_dir/"*.a "$lib_dir" 2>/dev/null || log "$rel_dir does not contain *.a files" | ||||||||
| # Create an SO file from the copied a file | ||||||||
| log "Creating a shared library from the compiled static library" | ||||||||
| log "Running : $cc --shared -L"$lib_dir" \ | ||||||||
| -Wl,--whole-archive -liec61131std \ | ||||||||
| -o "$lib_dir/out.so" -Wl,--no-whole-archive \ | ||||||||
| -lm \ | ||||||||
| -fuse-ld=lld " | ||||||||
| $cc --shared -L"$lib_dir" \ | ||||||||
| -Wl,--whole-archive -liec61131std \ | ||||||||
| -o "$lib_dir/out.so" -Wl,--no-whole-archive \ | ||||||||
| -lm \ | ||||||||
| -fuse-ld=lld | ||||||||
| mv "$lib_dir/out.so" "$lib_dir/libiec61131std.so" | ||||||||
| # Check if we're on macOS and adjust linker flags accordingly | ||||||||
| unameOut="$(uname -s)" | ||||||||
| case "${unameOut}" in | ||||||||
| Darwin*) | ||||||||
| log "Running : $cc --shared -L"$lib_dir" \ | ||||||||
| -Wl,-force_load,$lib_dir/libiec61131std.a \ | ||||||||
| -o "$lib_dir/libiec61131std.so" \ | ||||||||
| -lm -framework CoreFoundation" | ||||||||
| $cc --shared -L"$lib_dir" \ | ||||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The macOS branch invocation is missing the
Suggested change
Copilot uses AI. Check for mistakes. Positive FeedbackNegative Feedback |
||||||||
| -Wl,-force_load,"$lib_dir/libiec61131std.a" \ | ||||||||
| -o "$lib_dir/libiec61131std.so" \ | ||||||||
| -lm -framework CoreFoundation | ||||||||
| ;; | ||||||||
| *) | ||||||||
| log "Running : $cc --shared -L"$lib_dir" \ | ||||||||
| -Wl,--whole-archive -liec61131std \ | ||||||||
| -o "$lib_dir/libiec61131std.so" -Wl,--no-whole-archive \ | ||||||||
| -lm \ | ||||||||
| -fuse-ld=lld " | ||||||||
| $cc --shared -L"$lib_dir" \ | ||||||||
| -Wl,--whole-archive -liec61131std \ | ||||||||
| -o "$lib_dir/libiec61131std.so" -Wl,--no-whole-archive \ | ||||||||
| -lm \ | ||||||||
| -fuse-ld=lld | ||||||||
| ;; | ||||||||
| esac | ||||||||
| fi | ||||||||
|
|
||||||||
| log "Enabling read/write on the output folder" | ||||||||
| chmod a+rw $OUTPUT_DIR -R | ||||||||
| chmod -R a+rw $OUTPUT_DIR | ||||||||
|
|
||||||||
| } | ||||||||
|
|
||||||||
|
|
@@ -506,7 +538,7 @@ fi | |||||||
|
|
||||||||
| if [[ -d $project_location/target/ ]]; then | ||||||||
| log "Allow access to target folders" | ||||||||
| chmod a+rw -R $project_location/target/ | ||||||||
| chmod -R a+rw $project_location/target/ | ||||||||
| fi | ||||||||
|
|
||||||||
| if [[ $offline -ne 0 ]]; then | ||||||||
|
|
||||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[nitpick] The macOS-specific linking logic is duplicated in two sections. Consider extracting this into a helper function or shared snippet to avoid repetition and simplify future maintenance.
Copilot uses AI. Check for mistakes.