Skip to content

Commit

Permalink
Merge pull request #9530 from cms-sw/enable-as-needed-flag
Browse files Browse the repository at this point in the history
enable --as-needed flag for scram projects
  • Loading branch information
smuzaffar authored Nov 25, 2024
2 parents 3c44c62 + c7d167e commit 67531f4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion scram-tools.file/tools/gcc/env.sh
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
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
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>

0 comments on commit 67531f4

Please sign in to comment.