From 9bc9003cdd5feb49fa9527c6e27d6a4365f194e1 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Fri, 27 Oct 2017 15:12:06 +0300 Subject: [PATCH] Fix libcurl sampl --- samples/libcurl/build.gradle | 7 ++++++- samples/libcurl/build.sh | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/samples/libcurl/build.gradle b/samples/libcurl/build.gradle index 7a3f4721811..e812db46e2a 100644 --- a/samples/libcurl/build.gradle +++ b/samples/libcurl/build.gradle @@ -2,7 +2,12 @@ apply plugin: 'konan' konanArtifacts { interop('libcurl') { - includeDirs '/usr/include', '/opt/local/include', '/usr/local/opt/curl/include', '.' + target('linux') { + includeDirs '/usr/include' + } + target('macbook') { + includeDirs '/opt/local/include', '/usr/local/include' + } } program('Curl') { diff --git a/samples/libcurl/build.sh b/samples/libcurl/build.sh index a931ab993ed..58fa19e9327 100755 --- a/samples/libcurl/build.sh +++ b/samples/libcurl/build.sh @@ -22,7 +22,7 @@ COMPILER_ARGS=${!var} # add -opt for an optimized build. mkdir -p $DIR/build/c_interop/ mkdir -p $DIR/build/bin/ -cinterop -compilerOpts "$CFLAGS" -compilerOpts -I$DIR -compilerOpts -I/usr/include -def $DIR/src/main/c_interop/libcurl.def -target $TARGET \ +cinterop -compilerOpts "$CFLAGS" -compilerOpts -I$DIR -def $DIR/src/main/c_interop/libcurl.def -target $TARGET \ -o $DIR/build/c_interop/libcurl || exit 1 konanc -target $TARGET $DIR/src/main/kotlin -library $DIR/build/c_interop/libcurl \