Skip to content

Use static libssh2_config.h on MacOS builds #1569

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

Merged
implausible merged 8 commits into from
Oct 19, 2018
Merged

Use static libssh2_config.h on MacOS builds #1569

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4a0faed
Prework: Move openssl_distributions file into `vendor/static_config`
emmax86 Oct 16, 2018
9c0c983
Ensure `static_config` directory exists before writing openssl_distri…
emmax86 Oct 16, 2018
c268b63
Move `libssh2/win32` directory to `vendor/static_config`
emmax86 Oct 16, 2018
0fe23f3
Add static configured libssh2 header for MacOS
emmax86 Oct 16, 2018
a09613c
Copy Windows / Darwin static configuration files into `libssh` as con…
emmax86 Oct 16, 2018
3945596
Don't no-op configureLibssh2 on Windows anymore.
emmax86 Oct 16, 2018
b29ab01
Move `static_config/win32` back into `vendor/libssh2`
emmax86 Oct 17, 2018
23b98da
Copy libssh2 config headers straight into `vendor/libssh2`
emmax86 Oct 17, 2018
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
Prev Previous commit
Next Next commit
Don't no-op configureLibssh2 on Windows anymore.
  • Loading branch information
@emmax86
emmax86 committed Oct 16, 2018
commit 3945596a9bb3616abf571df7ecd1c7c8842f2f0f
7 changes: 1 addition & 6 deletions utils/configureLibssh2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,5 @@ module.exports = function retrieveExternalDependencies() {

// Called on the command line
if (require.main === module) {
if (process.platform === "win32") {
console.log("nothing to do");
}
else {
module.exports();
}
module.exports();
}