Bazel Adjustments (Imports, 0.7.0) (#27)

* fix boost skylark import when using external repos * Update third_party for newer Bazel versions
meltwater · Nov 1, 2017 · 6288e52 · 6288e52
1 parent f6c958a
commit 6288e52
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/third_party/boost/BUILD b/third_party/boost/BUILD
@@ -2,7 +2,7 @@ licenses(["notice"])
 
 boost_path = "upstream"
 
-load("/third_party/boost/tool", "boost_library")
+load("//third_party/boost:tool.bzl", "boost_library")
 
 boost_library(
   name = "assert",

diff --git a/third_party/boost/tool.bzl b/third_party/boost/tool.bzl
@@ -1,20 +1,23 @@
-is_library = False
-
-if is_library:
-  include_path = "@boost/include"
-  library_path = "@boost/lib"
-  includes_pattern = include_path + "/%s/"
-  include_pattern1 = includes_pattern + "**/*.h"
-  include_pattern2 = includes_pattern + "**/*pp" # hpp and ipp
-else:
-  includes_pattern = "upstream/%s/include"
-  include_pattern1 = includes_pattern + "/boost/**/*.h"
-  include_pattern2 = includes_pattern + "/boost/**/*pp"
+def _is_library( is_library = False ):
+  if is_library:
+    include_path = "@boost/include"
+    library_path = "@boost/lib"
+    includes_pattern = include_path + "/%s/"
+    include_pattern1 = includes_pattern + "**/*.h"
+    include_pattern2 = includes_pattern + "**/*pp" # hpp and ipp
+  else:
+    includes_pattern = "upstream/%s/include"
+    include_pattern1 = includes_pattern + "/boost/**/*.h"
+    include_pattern2 = includes_pattern + "/boost/**/*pp"
+
+  return includes_pattern, include_pattern1, include_pattern2
 
 def includes_list( library_name ):
+  includes_pattern, include_pattern1, include_pattern2 = _is_library()
   return [ includes_pattern % library_name ]
 
 def hdr_list( library_name ):
+  includes_pattern, include_pattern1, include_pattern2 = _is_library()
   return native.glob([
     include_pattern1 % library_name,
     include_pattern2 % library_name,