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

Get rid of -nolink flag uses.

Browse Source
This commit is contained in:
Alexander Gorshenev
2017-05-23 19:22:15 +03:00
committed by alexander-gorshenev
parent 380010d1ee
commit c93bddbba1
8 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
+2 -15
View File
@@ -308,7 +308,7 @@ class RunInteropKonanTest extends KonanTest {
void compileTest(List<String> filesToCompile, String exe) {
String interopBc = exe + "-interop.bc"
runCompiler([interopConf.generatedSrcDir.absolutePath], interopBc, ["-nolink"])
runCompiler([interopConf.generatedSrcDir.absolutePath], interopBc, ['-produce', 'library'])
String interopStubsBc = new File(interopConf.nativeLibsDir, interop + "stubs.bc").absolutePath
@@ -321,19 +321,6 @@ class RunInteropKonanTest extends KonanTest {
}
}
@ParallelizableTask
class LinkKonanTestNoStdlib extends KonanTest {
protected String lib
void compileTest(List<String> filesToCompile, String exe) {
def libDir = project.file(lib).absolutePath
def libBc = "${libDir}.bc"
runCompiler(lib, libBc, ['-nolink', '-nostdlib'])
runCompiler(filesToCompile, exe, ['-library', libBc])
}
}
@ParallelizableTask
class LinkKonanTest extends KonanTest {
protected String lib
@@ -342,7 +329,7 @@ class LinkKonanTest extends KonanTest {
def libDir = project.file(lib).absolutePath
def libBc = "${libDir}.bc"
runCompiler(lib, libBc, ['-nolink'] + ((flags != null) ? flags :[]))
runCompiler(lib, libBc, ['-produce', 'library'] + ((flags != null) ? flags :[]))
runCompiler(filesToCompile, exe, ['-library', libBc] + ((flags != null) ? flags :[]))
}
}