Skip to content

Add dependancy for Linux static-stdlib link argument files #7147

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

Merged
merged 1 commit into from
Feb 6, 2017

Conversation

spevans
Copy link
Contributor

@spevans spevans commented Jan 30, 2017

Fix the makefiles to add the correct dependancies for the static-executable-args.lnk and static-stdlib-args.lnk files.

This broke incremental compiles if either of the source files was updated

@spevans
Copy link
Contributor Author

spevans commented Jan 30, 2017

@slavapestov This should fix the issue with the Driver/static_stdlib_linux_swift/ test. It would work on a clean compile but broke incremental builds

@spevans
Copy link
Contributor Author

spevans commented Feb 2, 2017

@slavapestov @jckarter This is a CMakefile fix for the Driver/static_stdlib_linux_swift/ test bug Slava found . Could you take a quick look when you have time, thanks.

@jckarter
Copy link
Contributor

jckarter commented Feb 2, 2017

Looks good, thanks!

@jckarter
Copy link
Contributor

jckarter commented Feb 2, 2017

@swift-ci Please test

@compnerd compnerd merged commit 1466a5e into swiftlang:master Feb 6, 2017
"${SWIFTSTATICLIB_DIR}/${linkfile}")
"${SWIFTSTATICLIB_DIR}/${linkfile}"
DEPENDS
"${SWIFT_SOURCE_DIR}/utils/${lowercase}/static-executable-args.lnk")
Copy link
Contributor

Choose a reason for hiding this comment

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

@spevans There is no ${lowercase} variable actually defined, so this always expands to the empty string. That matches up with the source tree, where static-executable-args.lnk is just a file in utils/, but may not be what you wanted.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@rjmccall Ah - good spot! I will sort out a PR to remove this variable for now as its not needed.

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.

4 participants