Skip to content

Conversation

@shajrawi
Copy link

cherry-pick #23996 to 5.1 branch
rdar://problem/49835064

…tutions This change the order the configuration file to something that makes more sense: the platform_module_dir value was being set in the middle of the config.substitutions phase. We needed said value for setting the DYLD_LIBRARY_PATH, so that code was added right after it. The problem is that by that time config.substitutions.append(('%target-run', config.target_run)) has already happened for local targets This change moves all said code to just before the substitutions phase, much cleaner and resolves rdar://problem/49835064
@shajrawi shajrawi force-pushed the cherry_51_lit_bugfix branch from ccaf733 to 0184544 Compare April 13, 2019 07:22
@swiftlang swiftlang deleted a comment from swift-ci Apr 13, 2019
@swiftlang swiftlang deleted a comment from swift-ci Apr 13, 2019
@shajrawi shajrawi force-pushed the cherry_51_lit_bugfix branch from c34ce6c to 0184544 Compare April 13, 2019 07:29
@swiftlang swiftlang deleted a comment from swift-ci Apr 13, 2019
@swiftlang swiftlang deleted a comment from swift-ci Apr 13, 2019
@shajrawi
Copy link
Author

@swift-ci Please test and merge

@swiftlang swiftlang deleted a comment from swift-ci Apr 13, 2019
@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - ccaf733eb956b50b70687d1654b6300b4e7ebf99

@shajrawi
Copy link
Author

@swift-ci Please test Linux

@shajrawi shajrawi merged commit ad3e6c7 into swiftlang:swift-5.1-branch Apr 13, 2019
@shajrawi shajrawi deleted the cherry_51_lit_bugfix branch April 13, 2019 18:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

2 participants