From 2b0b06cbf4288746075a74c12ef233efc929a095 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 22 May 2015 15:23:54 +0200
Subject: Avoid relying on static initialization order

---
 build/bin/target.cxx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'build/bin/target.cxx')

diff --git a/build/bin/target.cxx b/build/bin/target.cxx
index cb7959c..1d69063 100644
--- a/build/bin/target.cxx
+++ b/build/bin/target.cxx
@@ -28,7 +28,7 @@ namespace build
       "obja",
       &file::static_type,
       &obja_factory,
-      file::static_type.search
+      &search_file
     };
 
     static target*
@@ -49,7 +49,7 @@ namespace build
       "objso",
       &file::static_type,
       &objso_factory,
-      file::static_type.search
+      &search_file
     };
 
     static target*
@@ -74,7 +74,7 @@ namespace build
       "obj",
       &target::static_type,
       &obj_factory,
-      target::static_type.search
+      &search_target
     };
 
     const target_type exe::static_type
@@ -83,7 +83,7 @@ namespace build
       "exe",
       &file::static_type,
       &target_factory<exe>,
-      file::static_type.search
+      &search_file
     };
 
     static target*
@@ -104,7 +104,7 @@ namespace build
       "liba",
       &file::static_type,
       &liba_factory,
-      file::static_type.search
+      &search_file
     };
 
     static target*
@@ -125,7 +125,7 @@ namespace build
       "libso",
       &file::static_type,
       &libso_factory,
-      file::static_type.search
+      &search_file
     };
 
     static target*
@@ -150,7 +150,7 @@ namespace build
       "lib",
       &target::static_type,
       &lib_factory,
-      target::static_type.search
+      &search_target
     };
   }
 }
-- 
cgit v1.1