azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stash conflict occsionaly commited removed

Browse Source
This commit is contained in:
Vasily Levchenko
2016-11-03 06:29:41 +03:00
parent 09fb11fbc9
commit c6a5ec26d9
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/tests/build.gradle
-5
View File
@@ -40,14 +40,9 @@ abstract class KonanTest extends DefaultTask {
"-headers", project.project(':runtime').file('src/main/kotlin'), "-headers", project.project(':runtime').file('src/main/kotlin'),
"${sourceKt.absolutePath}" "${sourceKt.absolutePath}"
<<<<<<< Updated upstream
String libraryPath = "${project.llvmDir}/lib:${backendNative.buildDir.canonicalPath}/nativelibs" String libraryPath = "${project.llvmDir}/lib:${backendNative.buildDir.canonicalPath}/nativelibs"
environment 'LD_LIBRARY_PATH' : libraryPath environment 'LD_LIBRARY_PATH' : libraryPath
environment 'DYLD_LIBRARY_PATH' : libraryPath environment 'DYLD_LIBRARY_PATH' : libraryPath
=======
jvmArgs "-Djava.library.path=${backendNative.buildDir.canonicalPath}/nativelibs"
environment LD_LIBRARY_PATH : "${project.parent.llvmDir}/lib"
>>>>>>> Stashed changes
} }
return sourceBc return sourceBc
} }