From f6c040ea3d050feb7dabec89af0996b9990f3a11 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Tue, 26 Sep 2017 14:10:18 +0300 Subject: [PATCH] [interop][shared] introduce depends field of DefFile for declaring library dependencies diff --git a/klib/src/platform/osx/objc.def b/klib/src/platform/osx/objc.def index 9631fe3b..510de838 100644 --- a/klib/src/platform/osx/objc.def +++ b/klib/src/platform/osx/objc.def @@ -7,6 +7,6 @@ headers = objc/List.h objc/NSObjCRuntime.h objc/NSObject.h objc/Object.h objc/Pr compilerOpts = -D_XOPEN_SOURCE linkerOpts = -lobjc - +depends = osx posix --- // objc-auto.h is excluded so far due to interop issues. diff --git a/klib/src/platform/osx/osx.def b/klib/src/platform/osx/osx.def index 8dfd8116..6573dc0c 100644 --- a/klib/src/platform/osx/osx.def +++ b/klib/src/platform/osx/osx.def @@ -28,6 +28,7 @@ headers = AppleTextureEncoder.h AssertMacros.h Availability.h AvailabilityIntern compilerOpts = -D_XOPEN_SOURCE linkerOpts = -ldl -lz +depends = posix --- diff --git a/klib/src/platform/osx/zlib.def b/klib/src/platform/osx/zlib.def index 46ed691d..e3cab7ba 100644 --- a/klib/src/platform/osx/zlib.def +++ b/klib/src/platform/osx/zlib.def @@ -1,3 +1,4 @@ package = platform.zlib headers = zconf.h zlib.h linkerOpts = -lz +depends=posix --- .../main/kotlin/org/jetbrains/kotlin/konan/util/DefFile.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DefFile.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DefFile.kt index edd45e65413..94c1f070142 100644 --- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DefFile.kt +++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DefFile.kt @@ -71,6 +71,10 @@ class DefFile(val file:File?, val config:DefFileConfig, val manifestAddendProper val nonStrictEnums by lazy { properties.getSpaceSeparated("nonStrictEnums") } + + val depends by lazy { + properties.getSpaceSeparated("depends") + } } }