Skip to content

#2055: replace --enable-new-dtags with --disable-new-dtags instead of remove…#2131

Merged
boegel merged 3 commits intoeasybuilders:developfrom
sara-nl:rpath
Feb 28, 2017
Merged

#2055: replace --enable-new-dtags with --disable-new-dtags instead of remove…#2131
boegel merged 3 commits intoeasybuilders:developfrom
sara-nl:rpath

Conversation

@jdonners
Copy link
Copy Markdown

… from command-line

Comment thread easybuild/scripts/rpath_args.py Outdated
# this would result in copying rpath to runpath, meaning that $LD_LIBRARY_PATH is taken into account again
elif arg == '--enable-new-dtags':
cmd_args.append('--disable-new-dtags');
elif arg != '--enable-new-dtags':
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

with introducing the arg == '--enable-new-dtags' above, we can just make this else: rather than elif ...:?

Comment thread easybuild/scripts/rpath_args.py Outdated
@@ -93,6 +93,8 @@

# filter out --enable-new-dtags if it's used;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jdonners please also fix this comment, to something like # replace --enable-new-dtags with --disable-new-dtags if it's used

the last bit makes me wonder: should we just always inject --disable-new-dtags (maybe combined with filtering out --enable-new-dtags, to be sure)?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually, we already inject --disable-new-dtags, see line 114... so how can this patch fix anything?

Copy link
Copy Markdown
Author

@jdonners jdonners Feb 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it fixes the cases where the command-line consists of ... -Wl, --enable-new-dtags -fomit-frame-pointer. In the current version, rpath_args.py would modify this into -Wl, -fomit-frame-pointer and the option -fomit-frame-pointer is passed to the linker, which fails because it is an unknown option. The fix just passes the same option --disable-new-dtags multiple times to the linker, which shouldn't be a problem.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, ok, good point...

Maybe clarify that with a comment here, since I suspect otherwise people (e.g. me) will go wonder again why we don't just drop --enable-new-dtags or why we possible add --disable-new-dtags multiple times... :)

@boegel boegel added this to the 3.2.0 milestone Feb 24, 2017
@boegel
Copy link
Copy Markdown
Member

boegel commented Feb 27, 2017

@jdonners Are you up for making the requested changes so we can merge this in? See http://easybuild.readthedocs.io/en/latest/Contributing.html#updating-existing-pull-requests

@jdonners
Copy link
Copy Markdown
Author

The checks will fail, since it expects only once --disable-new-dtags, while it now includes the same flag twice.

@boegel
Copy link
Copy Markdown
Member

boegel commented Feb 27, 2017

@jdonners Can you also change the test accordingly? see test/framework/toolchain.py

@boegel
Copy link
Copy Markdown
Member

boegel commented Feb 28, 2017

Thanks for the fix @jdonners!

@boegel boegel merged commit 02f3f04 into easybuilders:develop Feb 28, 2017
@boegel boegel modified the milestones: 3.1.1, 3.2.0 Feb 28, 2017
@jdonners jdonners deleted the rpath branch March 1, 2017 07:18
@jdonners jdonners restored the rpath branch March 1, 2017 07:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants