Changeset 1440

Timestamp:

12/02/09 17:13:48 (8 months ago)

Author:

dane

Message:

FAST and JOBS Scons options never worked because they need to be applied to the build step not configure - thanks timlinux for catching

Files:

• trunk/SConstruct (modified) (2 diffs)

trunk/SConstruct

@@ -569 +569 @@
     env['PLUGINS'] = PLUGINS
     
-    if env['FAST']:
-        # caching is 'auto' by default in SCons
-        # But let's also cache implicit deps...
-        EnsureSConsVersion(0,98)
-        SetOption('implicit_cache', 1)
-        env.Decider('MD5-timestamp')
-        SetOption('max_drift', 1)
-        
-    else:
-        # Set the cache mode to 'force' unless requested, avoiding hidden caching of Scons 'opts' in '.sconsign.dblite'
-        # This allows for a SCONS_LOCAL_CONFIG, if present, to be used as the primary means of storing paths to successful build dependencies
-        SetCacheMode('force')
-    
-    if env['JOBS'] > 1:
-        SetOption("num_jobs", env['JOBS'])  
-    
     if env['PKG_CONFIG_PATH']:
         env['ENV']['PKG_CONFIG_PATH'] = env['PKG_CONFIG_PATH']
@@ -960 +944 @@
 Export('env')
 
+
+if env['FAST']:
+    # caching is 'auto' by default in SCons
+    # But let's also cache implicit deps...
+    EnsureSConsVersion(0,98)
+    SetOption('implicit_cache', 1)
+    env.Decider('MD5-timestamp')
+    SetOption('max_drift', 1)
+    
+else:
+    # Set the cache mode to 'force' unless requested, avoiding hidden caching of Scons 'opts' in '.sconsign.dblite'
+    # This allows for a SCONS_LOCAL_CONFIG, if present, to be used as the primary means of storing paths to successful build dependencies
+    SetCacheMode('force')
+
+if env['JOBS'] > 1:
+    SetOption("num_jobs", env['JOBS'])  
+    
 # Build agg first, doesn't need anything special
 if env['INTERNAL_LIBAGG']: