@@ -45,11 +45,11 @@ func goAppleBind(gobind string, pkgs []*packages.Package, targets []targetInfo)
4545 }
4646
4747 // Run the gobind command for each platform
48- var wg errgroup.Group
48+ var gobindWG errgroup.Group
4949 for platform , outDir := range outDirsForPlatform {
5050 platform := platform
5151 outDir := outDir
52- wg .Go (func () error {
52+ gobindWG .Go (func () error {
5353 // Catalyst support requires iOS 13+
5454 v , _ := strconv .ParseFloat (buildIOSVersion , 64 )
5555 if platform == "maccatalyst" && v < 13.0 {
@@ -78,7 +78,7 @@ func goAppleBind(gobind string, pkgs []*packages.Package, targets []targetInfo)
7878 return nil
7979 })
8080 }
81- if err := wg .Wait (); err != nil {
81+ if err := gobindWG .Wait (); err != nil {
8282 return err
8383 }
8484
@@ -87,12 +87,60 @@ func goAppleBind(gobind string, pkgs []*packages.Package, targets []targetInfo)
8787 return err
8888 }
8989
90+ // Build archive files.
91+ var buildWG errgroup.Group
92+ for _ , t := range targets {
93+ t := t
94+ buildWG .Go (func () error {
95+ outDir := outDirsForPlatform [t .platform ]
96+ outSrcDir := filepath .Join (outDir , "src" )
97+
98+ if modulesUsed {
99+ // Copy the source directory for each architecture for concurrent building.
100+ newOutSrcDir := filepath .Join (outDir , "src-" + t .arch )
101+ if ! buildN {
102+ if err := doCopyAll (newOutSrcDir , outSrcDir ); err != nil {
103+ return err
104+ }
105+ }
106+ outSrcDir = newOutSrcDir
107+ }
108+
109+ // Copy the environment variables to make this function concurrent-safe.
110+ env := make ([]string , len (appleEnv [t .String ()]))
111+ copy (env , appleEnv [t .String ()])
112+
113+ // Add the generated packages to GOPATH for reverse bindings.
114+ gopath := fmt .Sprintf ("GOPATH=%s%c%s" , outDir , filepath .ListSeparator , goEnv ("GOPATH" ))
115+ env = append (env , gopath )
116+
117+ // Run `go mod tidy` to force to create go.sum.
118+ // Without go.sum, `go build` fails as of Go 1.16.
119+ if modulesUsed {
120+ if err := writeGoMod (outSrcDir , t .platform , t .arch ); err != nil {
121+ return err
122+ }
123+ if err := goModTidyAt (outSrcDir , env ); err != nil {
124+ return err
125+ }
126+ }
127+
128+ if err := goAppleBindArchive (appleArchiveFilepath (name , t ), env , outSrcDir ); err != nil {
129+ return fmt .Errorf ("%s/%s: %v" , t .platform , t .arch , err )
130+ }
131+
132+ return nil
133+ })
134+ }
135+ if err := buildWG .Wait (); err != nil {
136+ return err
137+ }
138+
90139 var frameworkDirs []string
91140 frameworkArchCount := map [string ]int {}
92141 for _ , t := range targets {
93142 outDir := outDirsForPlatform [t .platform ]
94- outSrcDir := filepath .Join (outDir , "src" )
95- gobindDir := filepath .Join (outSrcDir , "gobind" )
143+ gobindDir := filepath .Join (outDir , "src" , "gobind" )
96144
97145 env := appleEnv [t .String ()][:]
98146 sdk := getenv (env , "DARWIN_SDK" )
@@ -101,41 +149,14 @@ func goAppleBind(gobind string, pkgs []*packages.Package, targets []targetInfo)
101149 frameworkDirs = append (frameworkDirs , frameworkDir )
102150 frameworkArchCount [frameworkDir ] = frameworkArchCount [frameworkDir ] + 1
103151
104- fileBases := make ([]string , len (pkgs )+ 1 )
105- for i , pkg := range pkgs {
106- fileBases [i ] = bindPrefix + strings .Title (pkg .Name )
107- }
108- fileBases [len (fileBases )- 1 ] = "Universe"
109-
110- // Add the generated packages to GOPATH for reverse bindings.
111- gopath := fmt .Sprintf ("GOPATH=%s%c%s" , outDir , filepath .ListSeparator , goEnv ("GOPATH" ))
112- env = append (env , gopath )
113-
114- if err := writeGoMod (filepath .Join (outDir , "src" ), t .platform , t .arch ); err != nil {
115- return err
116- }
117-
118- // Run `go mod tidy` to force to create go.sum.
119- // Without go.sum, `go build` fails as of Go 1.16.
120- if modulesUsed {
121- if err := goModTidyAt (outSrcDir , env ); err != nil {
122- return err
123- }
124- }
125-
126- path , err := goAppleBindArchive (name + "-" + t .platform + "-" + t .arch , env , outSrcDir )
127- if err != nil {
128- return fmt .Errorf ("%s/%s: %v" , t .platform , t .arch , err )
129- }
130-
131152 versionsDir := filepath .Join (frameworkDir , "Versions" )
132153 versionsADir := filepath .Join (versionsDir , "A" )
133154 titlePath := filepath .Join (versionsADir , title )
134155 if frameworkArchCount [frameworkDir ] > 1 {
135156 // Not the first static lib, attach to a fat library and skip create headers
136157 fatCmd := exec .Command (
137158 "xcrun" ,
138- "lipo" , path , titlePath , "-create" , "-output" , titlePath ,
159+ "lipo" , appleArchiveFilepath ( name , t ) , titlePath , "-create" , "-output" , titlePath ,
139160 )
140161 if err := runCmd (fatCmd ); err != nil {
141162 return err
@@ -159,12 +180,18 @@ func goAppleBind(gobind string, pkgs []*packages.Package, targets []targetInfo)
159180
160181 lipoCmd := exec .Command (
161182 "xcrun" ,
162- "lipo" , path , "-create" , "-o" , titlePath ,
183+ "lipo" , appleArchiveFilepath ( name , t ) , "-create" , "-o" , titlePath ,
163184 )
164185 if err := runCmd (lipoCmd ); err != nil {
165186 return err
166187 }
167188
189+ fileBases := make ([]string , len (pkgs )+ 1 )
190+ for i , pkg := range pkgs {
191+ fileBases [i ] = bindPrefix + strings .Title (pkg .Name )
192+ }
193+ fileBases [len (fileBases )- 1 ] = "Universe"
194+
168195 // Copy header file next to output archive.
169196 var headerFiles []string
170197 if len (fileBases ) == 1 {
@@ -236,7 +263,6 @@ func goAppleBind(gobind string, pkgs []*packages.Package, targets []targetInfo)
236263 if err != nil {
237264 return err
238265 }
239-
240266 }
241267
242268 // Finally combine all frameworks to an XCFramework
@@ -267,13 +293,12 @@ var appleModuleMapTmpl = template.Must(template.New("iosmmap").Parse(`framework
267293 export *
268294}` ))
269295
270- func goAppleBindArchive (name string , env []string , gosrc string ) (string , error ) {
271- archive := filepath .Join (tmpdir , name + ".a" )
272- err := goBuildAt (gosrc , "./gobind" , env , "-buildmode=c-archive" , "-o" , archive )
273- if err != nil {
274- return "" , err
275- }
276- return archive , nil
296+ func appleArchiveFilepath (name string , t targetInfo ) string {
297+ return filepath .Join (tmpdir , name + "-" + t .platform + "-" + t .arch + ".a" )
298+ }
299+
300+ func goAppleBindArchive (out string , env []string , gosrc string ) error {
301+ return goBuildAt (gosrc , "./gobind" , env , "-buildmode=c-archive" , "-o" , out )
277302}
278303
279304var appleBindHeaderTmpl = template .Must (template .New ("apple.h" ).Parse (`
0 commit comments