diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py
index d5795f34f2..2310abfbe9 100644
--- a/Tools/ardupilotwaf/boards.py
+++ b/Tools/ardupilotwaf/boards.py
@@ -46,6 +46,9 @@ class Board:
             else:
                 cfg.env[k] = val
 
+        cfg.load('toolchain')
+        cfg.load('compiler_cxx compiler_c')
+
     def configure_env(self, cfg, env):
         # Use a dictionary instead of the convetional list for definitions to
         # make easy to override them. Convert back to list before consumption.
diff --git a/wscript b/wscript
index 5a28d0abf5..934cdaad4c 100644
--- a/wscript
+++ b/wscript
@@ -78,8 +78,6 @@ def configure(cfg):
     cfg.env.BOARD = cfg.options.board
     boards.get_board(cfg.env.BOARD).configure(cfg)
 
-    cfg.load('toolchain')
-    cfg.load('compiler_cxx compiler_c')
     cfg.load('clang_compilation_database')
     cfg.load('waf_unit_test')
     cfg.load('mavgen')