Index: gypfiles/standalone.gypi |
diff --git a/gypfiles/standalone.gypi b/gypfiles/standalone.gypi |
index 9aeed5a14b4a24bb1d4828ec4b0e811434ce7c58..3191641310d89670860a0079f7cbecf682b7442f 100644 |
--- a/gypfiles/standalone.gypi |
+++ b/gypfiles/standalone.gypi |
@@ -63,52 +63,21 @@ |
'host_arch%': 'ia32', |
}], |
], |
- |
- # By default we build against a stable sysroot image to avoid |
- # depending on the packages installed on the local machine. Set this |
- # to 0 to build against locally installed headers and libraries (e.g. |
- # if packaging for a linux distro) |
- 'use_sysroot%': 1, |
}, |
'host_arch%': '<(host_arch)', |
'target_arch%': '<(host_arch)', |
- 'use_sysroot%': '<(use_sysroot)', |
'base_dir%': '<!(cd <(DEPTH) && python -c "import os; print os.getcwd()")', |
# Instrument for code coverage and use coverage wrapper to exclude some |
# files. Uses gcov if clang=0 is set explicitly. Otherwise, |
# sanitizer_coverage must be set too. |
'coverage%': 0, |
- |
- # Default sysroot if no sysroot can be provided. |
- 'sysroot%': '', |
- |
- 'conditions': [ |
- # The system root for linux builds. |
- ['OS=="linux" and use_sysroot==1', { |
- 'conditions': [ |
- ['target_arch=="arm"', { |
- 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_wheezy_arm-sysroot', |
- }], |
- ['target_arch=="x64"', { |
- 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_wheezy_amd64-sysroot', |
- }], |
- ['target_arch=="ia32"', { |
- 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_wheezy_i386-sysroot', |
- }], |
- ['target_arch=="mipsel"', { |
- 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_wheezy_mips-sysroot', |
- }], |
- ], |
- }], # OS=="linux" and use_sysroot==1 |
- ], |
}, |
'base_dir%': '<(base_dir)', |
'host_arch%': '<(host_arch)', |
'target_arch%': '<(target_arch)', |
'v8_target_arch%': '<(target_arch)', |
'coverage%': '<(coverage)', |
- 'sysroot%': '<(sysroot)', |
'asan%': 0, |
'lsan%': 0, |
'msan%': 0, |
@@ -192,7 +161,6 @@ |
'test_isolation_mode%': '<(test_isolation_mode)', |
'fastbuild%': '<(fastbuild)', |
'coverage%': '<(coverage)', |
- 'sysroot%': '<(sysroot)', |
# Add a simple extras solely for the purpose of the cctests |
'v8_extra_library_files': ['../test/cctest/test-extra.js'], |
@@ -659,18 +627,6 @@ |
'-B<(base_dir)/third_party/binutils/Linux_x64/Release/bin', |
], |
}], |
- ['sysroot!="" and clang==1', { |
- 'target_conditions': [ |
- ['_toolset=="target"', { |
- 'cflags': [ |
- '--sysroot=<(sysroot)', |
- ], |
- 'ldflags': [ |
- '--sysroot=<(sysroot)', |
- '<!(<(DEPTH)/build/linux/sysroot_ld_path.sh <(sysroot))', |
- ], |
- }]] |
- }], |
], |
}, |
}], |