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

enable --as-needed flag for scram projects #9530

Merged
merged 2 commits into from
Nov 25, 2024
Merged

enable --as-needed flag for scram projects #9530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86d7ea6
enable --as-needed flag for scram projects
smuzaffar Nov 25, 2024
c7d167e
fix order to linking lhapdfand pythia6 libs
smuzaffar Nov 25, 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 scram-tools.file/tools/gcc/env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if [ $(uname -s) = "Darwin" ] ; then
OS_LD_UNIT="-r"
else
OS_SHAREDFLAGS="-shared -Wl,-E"
OS_LDFLAGS="-Wl,-E -Wl,--hash-style=gnu"
OS_LDFLAGS="-Wl,-E -Wl,--hash-style=gnu -Wl,--as-needed"
OS_CXXFLAGS="-Werror=overflow"
OS_FFLAGS="-cpp"
OS_LD_UNIT="-r -z muldefs"
Expand Down
3 changes: 1 addition & 2 deletions scram-tools.file/tools/lhapdf/lhapdf.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<tool name="lhapdf" version="@TOOL_VERSION@">
<tool name="lhapdf" version="@TOOL_VERSION@" revision="1">
<lib name="LHAPDF"/>
<client>
<environment name="LHAPDF_BASE" default="@TOOL_ROOT@"/>
<environment name="LIBDIR" default="$LHAPDF_BASE/lib"/>
<environment name="INCLUDE" default="$LHAPDF_BASE/include"/>
</client>
<use name="pythia6"/>
<runtime name="LHAPDF_DATA_PATH" value="$LHAPDF_BASE/share/LHAPDF"/>
<runtime name="PATH" value="$LHAPDF_BASE/bin" type="path"/>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
Expand Down
3 changes: 2 additions & 1 deletion scram-tools.file/tools/pythia6/pythia6.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<tool name="pythia6" version="@TOOL_VERSION@" revision="1">
<tool name="pythia6" version="@TOOL_VERSION@" revision="2">
<lib name="pythia6"/>
<lib name="pythia6_dummy"/>
<client>
<environment name="PYTHIA6_BASE" default="@TOOL_ROOT@"/>
<environment name="LIBDIR" default="$PYTHIA6_BASE/lib"/>
</client>
<use name="lhapdf"/>
<use name="pythia6_headers"/>
<use name="f77compiler"/>
</tool>