Skip to content

Commit

Permalink
Merge pull request #59 from IBM-Swift/rename
Browse files Browse the repository at this point in the history
Rename OpenSSL system library target
  • Loading branch information
djones6 authored Oct 1, 2018
2 parents bc94b03 + 55b63f9 commit a143a69
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Package@swift-4.2.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var packageDependencies: [Package.Dependency] = [.package(url: "https://github.c
var targetDependencies: [Target.Dependency] = [.byName(name: "Socket")]

#if os(Linux)
targetDependencies.append(.target(name: "OpenSSL"))
targetDependencies.append(.target(name: "OpenSSLLocal1"))
#endif

var targets: [Target] = [
Expand All @@ -40,7 +40,7 @@ var targets: [Target] = [

#if os(Linux)
targets.append(
.systemLibrary(name: "OpenSSL")
.systemLibrary(name: "OpenSSLLocal1")
)
#endif

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
**/

module OpenSSL [system] {
module OpenSSLLocal1 [system] {
header "shim.h"
link "ssl"
link "crypto"
Expand Down
File renamed without changes.
4 changes: 4 additions & 0 deletions Sources/SSLService/SSLService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,12 @@ import Foundation
import Socket

#if os(Linux)
#if swift(>=4.2)
import OpenSSLLocal1
#else
import OpenSSL
#endif
#endif

import Dispatch

Expand Down

0 comments on commit a143a69

Please sign in to comment.