chrome/chrome.gyp - Issue 60070: Fix linking with gold by cleaning up lib dependencies.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome.gyp

Issue 60070: Fix linking with gold by cleaning up lib dependencies. (Closed)

Patch Set: Created 11 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/chrome.gyp

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp

index 4e3df4d619eeffca0ef053fccfd0626b83fa32a0..199a69d365a99fa2c63cd04b498ce9401f6c8923 100644

--- a/chrome/chrome.gyp

+++ b/chrome/chrome.gyp

@@ -314,6 +314,13 @@

'dependencies': [

'../build/linux/system.gyp:gtk',

+ 'link_settings': {

+ 'libraries': [

+ '-lX11',

+ '-lXrender',

+ '-lXext',

+ ],

+ },

}, { # else: 'OS!="linux"'

'sources!': [

'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',

@@ -1537,13 +1544,6 @@

# Needed for chrome_dll_main.cc #include of gtk/gtk.h

'../build/linux/system.gyp:gtk',

- 'link_settings': {

- 'libraries': [

- '-lX11',

- '-lXrender',

- '-lXext',

- ],

- },

'copies': [

{

'destination': '<(PRODUCT_DIR)',

« no previous file with comments | « build/linux/system.gyp ('k') | skia/skia.gyp » ('j') | no next file with comments »