Index: net/stress_cache.scons |
=================================================================== |
--- net/stress_cache.scons (revision 5681) |
+++ net/stress_cache.scons (working copy) |
@@ -10,43 +10,18 @@ |
env = env.Clone() |
-env.SConscript([ |
- # On Linux, dependencies must follow dependents, so... |
- # 1) net must come before base and modp_b64. |
- '$NET_DIR/using_net.scons', |
- |
+env.ApplySConscript([ |
'$BASE_DIR/using_base.scons', |
'$GTEST_DIR/../using_gtest.scons', |
'$ICU38_DIR/using_icu38.scons', |
-], {'env':env}) |
+ '$NET_DIR/using_net.scons', |
+]) |
-env.Prepend( |
- CPPPATH = [ |
- '$CHROME_SRC_DIR', |
- ], |
-) |
- |
if env['PLATFORM'] == 'win32': |
env.Prepend( |
CCFLAGS = [ |
- '/TP', |
'/WX', |
], |
- CPPDEFINES = [ |
- '_WIN32_WINNT=0x0600', |
- 'WINVER=0x0600', |
- '_HAS_EXCEPTIONS=0', |
- ], |
- LINKFLAGS = [ |
- '/DELAYLOAD:"dwmapi.dll"', |
- '/DELAYLOAD:"uxtheme.dll"', |
- '/MACHINE:X86', |
- '/FIXED:No', |
- '/safeseh', |
- '/dynamicbase', |
- '/ignore:4199', |
- '/nxcompat', |
- ], |
) |
input_files = [ |