Merge pull request #60092 from ahoppen/pr/fix-build-tooling-libs

ahoppen · web-flow · commit 0b316f86fcd7 · 2022-07-20T09:49:38.000+02:00
[build-tooling-libs] Don’t configure extra stdlib content
diff --git a/utils/build-tooling-libs b/utils/build-tooling-libs
@@ -235,6 +235,7 @@ class Builder(object):
             os.path.join(SWIFT_SOURCE_ROOT, 'swift'),
         ]
         cmake_args += [
+            "-DSWIFT_BUILD_SYNTAXPARSERLIB=TRUE",
             "-DSWIFT_BUILD_ONLY_SYNTAXPARSERLIB=TRUE",
             "-DSWIFT_BUILD_SYNTAXPARSERTEST=TRUE",
         ]
@@ -245,6 +246,7 @@ class Builder(object):
             "-DSWIFT_BUILD_STATIC_STDLIB=FALSE",
             "-DSWIFT_BUILD_DYNAMIC_SDK_OVERLAY=FALSE",
             "-DSWIFT_BUILD_STATIC_SDK_OVERLAY=FALSE",
+            "-DSWIFT_BUILD_STDLIB_EXTRA_TOOLCHAIN_CONTENT=FALSE",
         ]
         cmake_args += [
             "-DLLVM_ENABLE_LIBXML2=FALSE",

Original file line number	Diff line number	Diff line change
`@@ -235,6 +235,7 @@ class Builder(object):`
`235`	`235`	`os.path.join(SWIFT_SOURCE_ROOT, 'swift'),`
`236`	`236`	`]`
`237`	`237`	`cmake_args += [`
	`238`	`+ "-DSWIFT_BUILD_SYNTAXPARSERLIB=TRUE",`
`238`	`239`	`"-DSWIFT_BUILD_ONLY_SYNTAXPARSERLIB=TRUE",`
`239`	`240`	`"-DSWIFT_BUILD_SYNTAXPARSERTEST=TRUE",`
`240`	`241`	`]`
`@@ -245,6 +246,7 @@ class Builder(object):`
`245`	`246`	`"-DSWIFT_BUILD_STATIC_STDLIB=FALSE",`
`246`	`247`	`"-DSWIFT_BUILD_DYNAMIC_SDK_OVERLAY=FALSE",`
`247`	`248`	`"-DSWIFT_BUILD_STATIC_SDK_OVERLAY=FALSE",`
	`249`	`+ "-DSWIFT_BUILD_STDLIB_EXTRA_TOOLCHAIN_CONTENT=FALSE",`
`248`	`250`	`]`
`249`	`251`	`cmake_args += [`
`250`	`252`	`"-DLLVM_ENABLE_LIBXML2=FALSE",`