Work on Clang for pure GN build.

build/config/linux/pkg-config.py

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import json
 import os
 import subprocess
 import sys
 import re
 from optparse import OptionParser
 
 # This script runs pkg-config, optionally filtering out some results, and
 # returns the result.
 #
-# The result will be [ <includes>, <cflags>, <libs>, <lib_dirs> ] where each
-# member is itself a list of strings.
+# The result will be [ <includes>, <cflags>, <libs>, <lib_dirs>, <ldflags> ]
+# where each member is itself a list of strings.
 #
 # You can filter out matches using "-v <regexp>" where all results from
 # pkgconfig matching the given regular expression will be ignored. You can
 # specify more than one regular expression my specifying "-v" more than once.
 #
 # You can specify a sysroot using "-s <sysroot>" where sysroot is the absolute
 # system path to the sysroot used for compiling. This script will attempt to
 # generate correct paths for the sysroot.
 #
 # When using a sysroot, you must also specify the architecture via
 # "-a <arch>" where arch is either "x86" or "x64".
 
 # If this is run on non-Linux platforms, just return nothing and indicate
 # success. This allows us to "kind of emulate" a Linux build from other
 # platforms.
 if sys.platform.find("linux") == -1:
   print "[[],[],[],[]]"

[Nico, 2014/02/19 05:09:10]

I guess this should now read "[[],[],[],[],[]]"?

[Nico, 2014/02/19 05:18:23]

=> https://codereview.chromium.org/171993002/

   sys.exit(0)
 
 
 def SetConfigPath(options):
   """Set the PKG_CONFIG_PATH environment variable.
   This takes into account any sysroot and architecture specification from the
   options on the given command line."""
 
   sysroot = options.sysroot
   if not sysroot:
@@ skipping 87 matching lines @@
 
 
 sysroot = options.sysroot
 if not sysroot:
   sysroot = ''
 
 includes = []
 cflags = []
 libs = []
 lib_dirs = []
+ldflags = []
 
 for flag in all_flags[:]:
   if len(flag) == 0 or MatchesAnyRegexp(flag, strip_out):
     continue;
 
   if flag[:2] == '-l':
     libs.append(RewritePath(flag[2:], prefix, sysroot))
-  if flag[:2] == '-L':
+  elif flag[:2] == '-L':
     lib_dirs.append(RewritePath(flag[2:], prefix, sysroot))
   elif flag[:2] == '-I':
     includes.append(RewritePath(flag[2:], prefix, sysroot))
+  elif flag[:3] == '-Wl':
+    ldflags.append(flag)
+  elif flag == '-pthread':
+    # Many libs specify "-pthread" which we don't need since we always include
+    # this anyway. Removing it here prevents a bunch of duplicate inclusions on
+    # the command line.
+    pass
   else:
     cflags.append(flag)
 
 # Output a GN array, the first one is the cflags, the second are the libs. The
 # JSON formatter prints GN compatible lists when everything is a list of
 # strings.
-print json.dumps([includes, cflags, libs, lib_dirs])
+print json.dumps([includes, cflags, libs, lib_dirs, ldflags])