[PATCH] D80591: Patch up issues with GN builds (pthread / libz)

[Mitch Phillips via Phabricator via llvm-commits]

hctim updated this revision to Diff 266580.
hctim marked 3 inline comments as done.
hctim added a comment.

- Address Peter's comments.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D80591/new/

https://reviews.llvm.org/D80591

Files:
  llvm/utils/gn/build/libs/pthread/BUILD.gn
  llvm/utils/gn/build/toolchain/BUILD.gn


Index: llvm/utils/gn/build/toolchain/BUILD.gn
===================================================================
--- llvm/utils/gn/build/toolchain/BUILD.gn
+++ llvm/utils/gn/build/toolchain/BUILD.gn
@@ -88,7 +88,7 @@
       if (current_os == "mac") {
         command = "$ld {{ldflags}} -o $outfile {{libs}} {{inputs}}"
       } else {
-        command = "$ld {{ldflags}} -o $outfile {{libs}} -Wl,--start-group {{inputs}} -Wl,--end-group"
+        command = "$ld {{ldflags}} -o $outfile -Wl,--start-group {{libs}} {{inputs}} -Wl,--end-group"
       }
       description = "LINK $outfile"
       outputs = [ outfile ]
Index: llvm/utils/gn/build/libs/pthread/BUILD.gn
===================================================================
--- llvm/utils/gn/build/libs/pthread/BUILD.gn
+++ llvm/utils/gn/build/libs/pthread/BUILD.gn
@@ -2,12 +2,12 @@
 
 config("pthread_config") {
   visibility = [ ":pthread" ]
-  libs = [ "pthread" ]
+  ldflags = [ "-pthread" ]
 }
 
 group("pthread") {
   # On Android, bionic has built-in support for pthreads.
-  if (llvm_enable_threads && current_os != "win" && current_os != "android") {
-    public_configs = [ ":pthread_config" ]
+  if (llvm_enable_threads && current_os != "win") {
+    all_dependent_configs = [ ":pthread_config" ]
   }
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D80591.266580.patch
Type: text/x-patch
Size: 1278 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200527/147f5863/attachment.bin>