File tree Expand file tree Collapse file tree 3 files changed +0
-11
lines changed
plugins/package-managers/conan/src/main/kotlin Expand file tree Collapse file tree 3 files changed +0
-11
lines changed Original file line number Diff line number Diff line change @@ -122,12 +122,6 @@ class Conan(
122
122
private val config : ConanConfig
123
123
) : PackageManager(" Conan" ) {
124
124
companion object {
125
- internal val DUMMY_COMPILER_SETTINGS = arrayOf(
126
- " -s" , " compiler=gcc" ,
127
- " -s" , " compiler.libcxx=libstdc++" ,
128
- " -s" , " compiler.version=11.1"
129
- )
130
-
131
125
internal const val SCOPE_NAME_DEPENDENCIES = " requires"
132
126
internal const val SCOPE_NAME_DEV_DEPENDENCIES = " build_requires"
133
127
internal const val SCOPE_NAME_TEST_DEPENDENCIES = " test_requires"
Original file line number Diff line number Diff line change @@ -30,7 +30,6 @@ import org.ossreviewtoolkit.model.PackageReference
30
30
import org.ossreviewtoolkit.model.RemoteArtifact
31
31
import org.ossreviewtoolkit.model.Scope
32
32
import org.ossreviewtoolkit.model.VcsInfo
33
- import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.DUMMY_COMPILER_SETTINGS
34
33
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEPENDENCIES
35
34
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEV_DEPENDENCIES
36
35
import org.ossreviewtoolkit.utils.common.Os
@@ -70,7 +69,6 @@ internal class ConanV1Handler(private val conan: Conan) : ConanVersionHandler {
70
69
definitionFile.name,
71
70
" --json" ,
72
71
jsonFile.absolutePath,
73
- * DUMMY_COMPILER_SETTINGS ,
74
72
" --profile" ,
75
73
" ort-default"
76
74
).requireSuccess()
Original file line number Diff line number Diff line change @@ -32,7 +32,6 @@ import org.ossreviewtoolkit.model.PackageReference
32
32
import org.ossreviewtoolkit.model.RemoteArtifact
33
33
import org.ossreviewtoolkit.model.Scope
34
34
import org.ossreviewtoolkit.model.VcsInfo
35
- import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.DUMMY_COMPILER_SETTINGS
36
35
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEPENDENCIES
37
36
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEV_DEPENDENCIES
38
37
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_TEST_DEPENDENCIES
@@ -72,7 +71,6 @@ internal class ConanV2Handler(private val conan: Conan) : ConanVersionHandler {
72
71
lockfileName,
73
72
" --out-file" ,
74
73
jsonFile.absolutePath,
75
- * DUMMY_COMPILER_SETTINGS ,
76
74
definitionFile.name
77
75
).requireSuccess()
78
76
} else {
@@ -84,7 +82,6 @@ internal class ConanV2Handler(private val conan: Conan) : ConanVersionHandler {
84
82
" json" ,
85
83
" --out-file" ,
86
84
jsonFile.absolutePath,
87
- * DUMMY_COMPILER_SETTINGS ,
88
85
definitionFile.name,
89
86
" --profile" ,
90
87
" ort-default"
You can’t perform that action at this time.
0 commit comments