Build in a ../sconsbuild directory by default:

* Deps roll for ../sconsbuild support in gyp.
* Add a 'scons_settings': { 'sconsbuild_dir' } setting to common.gypi.
* Change uses of $DESTINATION_ROOT to $TOP_BUILDDIR.
Review URL: http://codereview.chromium.org/53133

git-svn-id: http://src.chromium.org/svn/trunk/src/build@12636 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
sgk@google.com 2009-03-27 04:27:01 +00:00
Родитель f8044caea8
Коммит a06dbbafff
1 изменённых файлов: 4 добавлений и 1 удалений

Просмотреть файл

@ -135,7 +135,7 @@
'LIBPATH': ['$LIB_DIR'],
# Linking of large files uses lots of RAM, so serialize links
# using the handy flock command from util-linux.
'FLOCK_LINK': ['flock', '$DESTINATION_ROOT/linker.lock', '$LINK'],
'FLOCK_LINK': ['flock', '$TOP_BUILDDIR/linker.lock', '$LINK'],
# We have several cases where archives depend on each other in
# a cyclic fashion. Since the GNU linker does only a single
@ -304,6 +304,9 @@
],
}],
],
'scons_settings': {
'sconsbuild_dir': '<(DEPTH)/sconsbuild',
},
'xcode_settings': {
# The Xcode generator will look for an xcode_settings section at the root
# of each dict and use it to apply settings on a file-wide basis. Most