Merge remote-tracking branch 'origin/master' into master-rebranch

swift-ci · swift-ci · commit 38bd084e6076 · 2019-08-26T20:44:42.000-07:00
diff --git a/stdlib/public/Platform/bionic.modulemap.gyb b/stdlib/public/Platform/bionic.modulemap.gyb
@@ -83,6 +83,7 @@ module SwiftGlibc [system] {
       export *
     }
     module math {
+      link "m"
       header "${GLIBC_INCLUDE_PATH}/math.h"
       export *
     }

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ module SwiftGlibc [system] {`
`83`	`83`	`export *`
`84`	`84`	`}`
`85`	`85`	`module math {`
	`86`	`+ link "m"`
`86`	`87`	`header "${GLIBC_INCLUDE_PATH}/math.h"`
`87`	`88`	`export *`
`88`	`89`	`}`