Merge pull request #39 from influxdata/windows_1.58

Marwes · web-flow · commit c94a5941e433 · 2022-01-19T09:54:32.000+01:00
fix: Flux needs to link to bcrypt on windows on Rust 1.58
diff --git a/libs/flux/build.go b/libs/flux/build.go
@@ -282,7 +282,7 @@ Name: Flux
 			_, _ = fmt.Fprintf(w, "Libs: -L${libdir} -lflux-${buildid} -ldl -lm\n")
 		}
 	} else if l.Target.OS == "windows" {
-		_, _ = fmt.Fprintf(w, "Libs: -L${libdir} -lflux-${buildid} -lws2_32 -luserenv\n")
+		_, _ = fmt.Fprintf(w, "Libs: -L${libdir} -lflux-${buildid} -lws2_32 -luserenv -lbcrypt\n")
 	} else {
 		_, _ = fmt.Fprintf(w, "Libs: -L${libdir} -lflux-${buildid}\n")
 	}

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ Name: Flux`
`282`	`282`	`_, _ = fmt.Fprintf(w, "Libs: -L${libdir} -lflux-${buildid} -ldl -lm\n")`
`283`	`283`	`}`
`284`	`284`	`} else if l.Target.OS == "windows" {`
`285`		`- _, _ = fmt.Fprintf(w, "Libs: -L${libdir} -lflux-${buildid} -lws2_32 -luserenv\n")`
	`285`	`+ _, _ = fmt.Fprintf(w, "Libs: -L${libdir} -lflux-${buildid} -lws2_32 -luserenv -lbcrypt\n")`
`286`	`286`	`} else {`
`287`	`287`	`_, _ = fmt.Fprintf(w, "Libs: -L${libdir} -lflux-${buildid}\n")`
`288`	`288`	`}`