diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-22 00:20:29 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-22 00:20:29 +0000 |
| commit | d06442883eb767e2b61de78f1d942fc0f9b87df1 (patch) | |
| tree | 1a4d51ffb76cca03ceeb56c3f4b606bee6cfa176 /build | |
| parent | 66cb83553557d41f5eb24a17c830f1e398fedb27 (diff) | |
| download | chromium_src-d06442883eb767e2b61de78f1d942fc0f9b87df1.zip chromium_src-d06442883eb767e2b61de78f1d942fc0f9b87df1.tar.gz chromium_src-d06442883eb767e2b61de78f1d942fc0f9b87df1.tar.bz2 | |
Build on Linux with shared libraries (significant chunks courtesy craigsch):
* Set $RPATH to $LIB_DIR in the SCons configuration.
* Add missing dependencies:
* net/net.gyp:net
=> testing/gtest.gyp:gtest
* third_party/libxml/libxml.gyp:xmlcatalog
=> third_party/icu38/icu38.gyp:icuuc
* chrome/chrome.gyp:perf_tests
=> renderer
=> views
=> webkit/webkit.gyp:glue
* Add files:
* third_party/WebKit/WebCore/loader/icon/IconRecord.cpp
* third_party/WebKit/WebCore/page/Coordinates.cpp
* skia/sgl/SkUnPreMultiply.cpp
* Exclude on Linux:
* chrome/views/controls/scroll_view.cc
* chrome/views/focus/external_focus_tracker.cc
* media/filter/ffmpeg_demuxer.{cc,h}
* Remove files:
* third_party/WebKit/WebCore/Configurations/Version.xcconfig
* Sort the chrome.gyp:views linux exclusion list.
* DEPS roll for $SHLINKFLAGS settings in gyp.
Review URL: http://codereview.chromium.org/88058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index 1d81fb2..2c7dde2 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -219,6 +219,12 @@ 'SHLINKCOM': [['$FLOCK_SHLINK', '-o', '$TARGET', '$_LIBDIRFLAGS', '$SHLINKFLAGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']], 'LDMODULECOM': [['$FLOCK_LDMODULE', '-o', '$TARGET', '$_LIBDIRFLAGS', '$LDMODULEFLAGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']], 'IMPLICIT_COMMAND_DEPENDENCIES': 0, + # -rpath is only used when building with shared libraries. + 'conditions': [ + [ 'library=="shared_library"', { + 'RPATH': '$LIB_DIR', + }], + ], }, 'scons_import_variables': [ 'CC', |