Skip to content
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

bugfix: change linker flag option for mac builds of charm4py #3797

Merged
merged 5 commits into from
May 2, 2024
Merged

bugfix: change linker flag option for mac builds of charm4py #3797

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
80bab25
bugfix: use CMK_SHARED_SUF instead of a hardcoded .so
ebohm Mar 27, 2024
c465a7f
comment out configure lines to allow charm4py build to proceed
Mar 27, 2024
7af3e01
Replace whole archive flag with all_load flag for macs
Mar 31, 2024
577d660
Merge branch 'main' into ericbohm/fix_makefile_for_libcharm
ZwFink May 1, 2024
b89f142
Merge remote-tracking branch 'origin/main' into ericbohm/fix_makefile…
May 1, 2024
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
2 changes: 1 addition & 1 deletion src/scripts/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ AMPIC AMPIF: AMPI
f90charm: charm++

libcharm: charm++
cd $(L) ; $(CHARMC) -standalone -whole-archive -c++stl -shared -o libcharm.so $(LIBCHARM_LIBS)
cd $(L) ; $(CHARMC) -standalone -whole-archive -c++stl -shared -o libcharm.$(CMK_SHARED_SUF) $(LIBCHARM_LIBS)

charm4py: libcharm

Expand Down
10 changes: 5 additions & 5 deletions src/scripts/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,11 +874,11 @@ EOF
fi
done

if test -z $got_opt_whole_archive
then
echo "Don't know how to build libcharm.so for Charm4py"
test_finish 1
fi
# if test -z $got_opt_whole_archive
# then
# echo "Don't know how to build libcharm.so for Charm4py"
# test_finish 1
# fi
ritvikrao marked this conversation as resolved.
Show resolved Hide resolved
fi

# Figure out if the user has asked to enable the latest language standards
Expand Down
Loading