Update toolchain configuration artifacts to work with latest version of bazel

PiperOrigin-RevId: 161531749

2 files changed, 68 insertions, 66 deletions

diff --git a/third_party/toolchains/cpus/CROSSTOOL b/third_party/toolchains/cpus/CROSSTOOL
index 0fff8191e0..66039c2135 100644
--- a/third_party/toolchains/cpus/CROSSTOOL
+++ b/third_party/toolchains/cpus/CROSSTOOL
@@ -185,7 +185,10 @@ toolchain {
         flag_group {
           flag: '-fprofile-arcs'
           flag: '-ftest-coverage'
-        }
+      }
+
+
+
       }
       flag_set {
         action: 'c++-link-interface-dynamic-library'
@@ -193,10 +196,9 @@ toolchain {
         action: 'c++-link-executable'
         flag_group {
           flag: '-lgcov'
-        }
+      }
       }
     }
-  
 }
 
 toolchain {
@@ -215,15 +217,15 @@ toolchain {
 
   tool_path {
     name: "ar"
-    path: "wrapper/bin/msvc_link.bat"
+    path: ""
   }
   tool_path {
     name: "cpp"
-    path: "wrapper/bin/msvc_cl.bat"
+    path: ""
   }
   tool_path {
     name: "gcc"
-    path: "wrapper/bin/msvc_cl.bat"
+    path: ""
   }
   tool_path {
     name: "gcov"
@@ -231,7 +233,7 @@ toolchain {
   }
   tool_path {
     name: "ld"
-    path: "wrapper/bin/msvc_link.bat"
+    path: ""
   }
   tool_path {
     name: "nm"
@@ -285,8 +287,6 @@ toolchain {
   compiler_flag: "/Gy"
   # Use string pooling.
   compiler_flag: "/GF"
-  # Warning level 3 (could possibly go to 4 in the future).
-  compiler_flag: "/W3"
   # Catch both asynchronous (structured) and synchronous (C++) exceptions.
   compiler_flag: "/EHsc"
 
@@ -304,6 +304,10 @@ toolchain {
 
   linker_flag: "/SUBSYSTEM:CONSOLE"
 
+  feature {
+    name: "no_legacy_features"
+  }
+
   # Suppress startup banner.
   feature {
     name: "nologo"
@@ -365,6 +369,18 @@ toolchain {
   }
 
   feature {
+    name: "use_linker"
+    env_set {
+      action: "c++-link-executable"
+      action: "c++-link-dynamic-library"
+      env_entry {
+        key: "USE_LINKER"
+        value: "1"
+      }
+    }
+  }
+
+  feature {
     name: 'include_paths'
     flag_set {
       action: 'preprocess-assemble'
@@ -425,7 +441,7 @@ toolchain {
     config_name: 'c-compile'
     action_name: 'c-compile'
     tool {
-      tool_path: 'wrapper/bin/msvc_cl.bat'
+      tool_path: ''
     }
     flag_set {
       flag_group {
@@ -461,7 +477,7 @@ toolchain {
     config_name: 'c++-compile'
     action_name: 'c++-compile'
     tool {
-      tool_path: 'wrapper/bin/msvc_cl.bat'
+      tool_path: ''
     }
     flag_set {
       flag_group {
@@ -497,26 +513,25 @@ toolchain {
     config_name: 'c++-link-executable'
     action_name: 'c++-link-executable'
     tool {
-      tool_path: 'wrapper/bin/msvc_link.bat'
+      tool_path: ''
     }
     implies: 'nologo'
-    implies: 'strip_debug_symbols'
     implies: 'linkstamps'
     implies: 'output_execpath_flags'
     implies: 'input_param_flags'
     implies: 'legacy_link_flags'
     implies: 'linker_param_file'
     implies: 'msvc_env'
+    implies: 'use_linker'
   }
 
   action_config {
     config_name: 'c++-link-dynamic-library'
     action_name: 'c++-link-dynamic-library'
     tool {
-      tool_path: 'wrapper/bin/msvc_link.bat'
+      tool_path: ''
     }
     implies: 'nologo'
-    implies: 'strip_debug_symbols'
     implies: 'shared_flag'
     implies: 'linkstamps'
     implies: 'output_execpath_flags'
@@ -525,15 +540,17 @@ toolchain {
     implies: 'legacy_link_flags'
     implies: 'linker_param_file'
     implies: 'msvc_env'
+    implies: 'use_linker'
   }
 
   action_config {
     config_name: 'c++-link-static-library'
     action_name: 'c++-link-static-library'
     tool {
-      tool_path: 'wrapper/bin/msvc_link.bat'
+      tool_path: ''
     }
     implies: 'nologo'
+    implies: 'archiver_flags'
     implies: 'input_param_flags'
     implies: 'linker_param_file'
     implies: 'msvc_env'
@@ -543,9 +560,10 @@ toolchain {
     config_name: 'c++-link-alwayslink-static-library'
     action_name: 'c++-link-alwayslink-static-library'
     tool {
-      tool_path: 'wrapper/bin/msvc_link.bat'
+      tool_path: ''
     }
     implies: 'nologo'
+    implies: 'archiver_flags'
     implies: 'input_param_flags'
     implies: 'linker_param_file'
     implies: 'msvc_env'
@@ -557,9 +575,10 @@ toolchain {
     config_name: 'c++-link-pic-static-library'
     action_name: 'c++-link-pic-static-library'
     tool {
-      tool_path: 'wrapper/bin/msvc_link.bat'
+      tool_path: ''
     }
     implies: 'nologo'
+    implies: 'archiver_flags'
     implies: 'input_param_flags'
     implies: 'linker_param_file'
     implies: 'msvc_env'
@@ -569,9 +588,10 @@ toolchain {
     config_name: 'c++-link-alwayslink-pic-static-library'
     action_name: 'c++-link-alwayslink-pic-static-library'
     tool {
-      tool_path: 'wrapper/bin/msvc_link.bat'
+      tool_path: ''
     }
     implies: 'nologo'
+    implies: 'archiver_flags'
     implies: 'input_param_flags'
     implies: 'linker_param_file'
     implies: 'msvc_env'
@@ -581,10 +601,9 @@ toolchain {
     config_name: 'c++-link-interface-dynamic-library'
     action_name: 'c++-link-interface-dynamic-library'
     tool {
-      tool_path: 'wrapper/bin/msvc_link.bat'
+      tool_path: ''
     }
     implies: 'nologo'
-    implies: 'strip_debug_symbols'
     implies: 'linker_param_file'
     implies: 'msvc_env'
   }
@@ -604,19 +623,6 @@ toolchain {
   }
 
   feature {
-    name: 'strip_debug_symbols'
-    flag_set {
-      action: 'c++-link-executable'
-      action: 'c++-link-dynamic-library'
-      action: 'c++-link-interface-dynamic-library'
-      flag_group {
-        expand_if_all_available: 'strip_debug_symbols'
-        flag: '-Wl,-S'
-      }
-    }
-  }
-
-  feature {
     name: 'shared_flag'
     flag_set {
       action: 'c++-link-dynamic-library'
@@ -652,16 +658,26 @@ toolchain {
   }
 
   feature {
-    name: 'input_param_flags'
+    name: 'archiver_flags'
     flag_set {
-      expand_if_all_available: 'library_search_directories'
-      action: 'c++-link-executable'
-      action: 'c++-link-dynamic-library'
+      expand_if_all_available: 'output_execpath'
       action: 'c++-link-static-library'
       action: 'c++-link-alwayslink-static-library'
       action: 'c++-link-pic-static-library'
       action: 'c++-link-alwayslink-pic-static-library'
       flag_group {
+        flag: '/OUT:%{output_execpath}'
+      }
+    }
+  }
+
+  feature {
+    name: 'input_param_flags'
+    flag_set {
+      expand_if_all_available: 'library_search_directories'
+      action: 'c++-link-executable'
+      action: 'c++-link-dynamic-library'
+      flag_group {
         iterate_over: 'library_search_directories'
         flag: "-L%{library_search_directories}"
       }
@@ -670,10 +686,6 @@ toolchain {
       expand_if_all_available: 'libopts'
       action: 'c++-link-executable'
       action: 'c++-link-dynamic-library'
-      action: 'c++-link-static-library'
-      action: 'c++-link-alwayslink-static-library'
-      action: 'c++-link-pic-static-library'
-      action: 'c++-link-alwayslink-pic-static-library'
       flag_group {
         iterate_over: 'libopts'
         flag: '%{libopts}'
@@ -787,12 +799,6 @@ toolchain {
       expand_if_all_available: 'linker_param_file'
       action: 'c++-link-executable'
       action: 'c++-link-dynamic-library'
-      flag_group {
-        flag: '-Wl,@%{linker_param_file}'
-      }
-    }
-    flag_set {
-      expand_if_all_available: 'linker_param_file'
       action: 'c++-link-static-library'
       action: 'c++-link-alwayslink-static-library'
       action: 'c++-link-pic-static-library'
@@ -907,22 +913,6 @@ toolchain {
     implies: 'link_crt_library'
   }
 
-  compilation_mode_flags {
-    mode: DBG
-    compiler_flag: "-Xcompilation-mode=dbg"
-    linker_flag: "-Xcompilation-mode=dbg"
-  }
-
-  compilation_mode_flags {
-    mode: FASTBUILD
-    compiler_flag: "-Xcompilation-mode=fastbuild"
-    linker_flag: "-Xcompilation-mode=fastbuild"
-  }
 
-  compilation_mode_flags {
-    mode: OPT
-    compiler_flag: "-Xcompilation-mode=opt"
-    linker_flag: "-Xcompilation-mode=opt"
-  }
 
 }
diff --git a/third_party/toolchains/cpus/py/BUILD b/third_party/toolchains/cpus/py/BUILD
index d54eebb8e7..c175742cbf 100644
--- a/third_party/toolchains/cpus/py/BUILD
+++ b/third_party/toolchains/cpus/py/BUILD
@@ -9,7 +9,17 @@ package(default_visibility = ["//visibility:public"])
 cc_library(
     name = "python_headers",
     hdrs = [":python_include"],
+    data = select({
+        ":windows": [":python_import_lib"],
+        "//conditions:default": [],
+    }),
     includes = ["python_include"],
+    linkopts = select({
+        # TODO(pcloudy): Ideally, this should just go into deps after resolving
+        # https://github.com/bazelbuild/bazel/issues/3237,
+        ":windows": ["$(locations :python_import_lib)"],
+        "//conditions:default": [],
+    }),
 )
 
 cc_library(
@@ -147,7 +157,8 @@ genrule(
         "python_include/Python-ast.h",
     ],
     cmd = """
-cp  "/usr/include/python2.7/code.h" "$(@D)/python_include/code.h" && cp  "/usr/include/python2.7/dtoa.h" "$(@D)/python_include/dtoa.h" && cp  "/usr/include/python2.7/tupleobject.h" "$(@D)/python_include/tupleobject.h" && cp  "/usr/include/python2.7/object.h" "$(@D)/python_include/object.h" && cp  "/usr/include/python2.7/ast.h" "$(@D)/python_include/ast.h" && cp  "/usr/include/python2.7/pymacconfig.h" "$(@D)/python_include/pymacconfig.h" && cp  "/usr/include/python2.7/errcode.h" "$(@D)/python_include/errcode.h" && cp  "/usr/include/python2.7/frameobject.h" "$(@D)/python_include/frameobject.h" && cp  "/usr/include/python2.7/pgenheaders.h" "$(@D)/python_include/pgenheaders.h" && cp  "/usr/include/python2.7/cellobject.h" "$(@D)/python_include/cellobject.h" && cp  "/usr/include/python2.7/intobject.h" "$(@D)/python_include/intobject.h" && cp  "/usr/include/python2.7/pythread.h" "$(@D)/python_include/pythread.h" && cp  "/usr/include/python2.7/cStringIO.h" "$(@D)/python_include/cStringIO.h" && cp  "/usr/include/python2.7/boolobject.h" "$(@D)/python_include/boolobject.h" && cp  "/usr/include/python2.7/modsupport.h" "$(@D)/python_include/modsupport.h" && cp  "/usr/include/python2.7/import.h" "$(@D)/python_include/import.h" && cp  "/usr/include/python2.7/pymath.h" "$(@D)/python_include/pymath.h" && cp  "/usr/include/python2.7/node.h" "$(@D)/python_include/node.h" && cp  "/usr/include/python2.7/funcobject.h" "$(@D)/python_include/funcobject.h" && cp  "/usr/include/python2.7/eval.h" "$(@D)/python_include/eval.h" && cp  "/usr/include/python2.7/longintrepr.h" "$(@D)/python_include/longintrepr.h" && cp  "/usr/include/python2.7/floatobject.h" "$(@D)/python_include/floatobject.h" && cp  "/usr/include/python2.7/rangeobject.h" "$(@D)/python_include/rangeobject.h" && cp  "/usr/include/python2.7/pyfpe.h" "$(@D)/python_include/pyfpe.h" && cp  "/usr/include/python2.7/pystrcmp.h" "$(@D)/python_include/pystrcmp.h" && cp  "/usr/include/python2.7/dictobject.h" "$(@D)/python_include/dictobject.h" && cp  "/usr/include/python2.7/pyarena.h" "$(@D)/python_include/pyarena.h" && cp  "/usr/include/python2.7/objimpl.h" "$(@D)/python_include/objimpl.h" && cp  "/usr/include/python2.7/bitset.h" "$(@D)/python_include/bitset.h" && cp  "/usr/include/python2.7/memoryobject.h" "$(@D)/python_include/memoryobject.h" && cp  "/usr/include/python2.7/bytearrayobject.h" "$(@D)/python_include/bytearrayobject.h" && cp  "/usr/include/python2.7/pydebug.h" "$(@D)/python_include/pydebug.h" && cp  "/usr/include/python2.7/pyerrors.h" "$(@D)/python_include/pyerrors.h" && cp  "/usr/include/python2.7/weakrefobject.h" "$(@D)/python_include/weakrefobject.h" && cp  "/usr/include/python2.7/grammar.h" "$(@D)/python_include/grammar.h" && cp  "/usr/include/python2.7/symtable.h" "$(@D)/python_include/symtable.h" && cp  "/usr/include/python2.7/longobject.h" "$(@D)/python_include/longobject.h" && cp  "/usr/include/python2.7/structmember.h" "$(@D)/python_include/structmember.h" && cp  "/usr/include/python2.7/enumobject.h" "$(@D)/python_include/enumobject.h" && cp  "/usr/include/python2.7/classobject.h" "$(@D)/python_include/classobject.h" && cp  "/usr/include/python2.7/unicodeobject.h" "$(@D)/python_include/unicodeobject.h" && cp  "/usr/include/python2.7/sliceobject.h" "$(@D)/python_include/sliceobject.h" && cp  "/usr/include/python2.7/pystrtod.h" "$(@D)/python_include/pystrtod.h" && cp  "/usr/include/python2.7/genobject.h" "$(@D)/python_include/genobject.h" && cp  "/usr/include/python2.7/pymactoolbox.h" "$(@D)/python_include/pymactoolbox.h" && cp  "/usr/include/python2.7/compile.h" "$(@D)/python_include/compile.h" && cp  "/usr/include/python2.7/pyexpat.h" "$(@D)/python_include/pyexpat.h" && cp  "/usr/include/python2.7/asdl.h" "$(@D)/python_include/asdl.h" && cp  "/usr/include/python2.7/codecs.h" "$(@D)/python_include/codecs.h" && cp  "/usr/include/python2.7/pyctype.h" "$(@D)/python_include/pyctype.h" && cp  "/usr/include/python2.7/sysmodule.h" "$(@D)/python_include/sysmodule.h" && cp  "/usr/include/python2.7/methodobject.h" "$(@D)/python_include/methodobject.h" && cp  "/usr/include/python2.7/graminit.h" "$(@D)/python_include/graminit.h" && cp  "/usr/include/python2.7/cobject.h" "$(@D)/python_include/cobject.h" && cp  "/usr/include/python2.7/intrcheck.h" "$(@D)/python_include/intrcheck.h" && cp  "/usr/include/python2.7/pyport.h" "$(@D)/python_include/pyport.h" && cp  "/usr/include/python2.7/warnings.h" "$(@D)/python_include/warnings.h" && cp  "/usr/include/python2.7/osdefs.h" "$(@D)/python_include/osdefs.h" && cp  "/usr/include/python2.7/fileobject.h" "$(@D)/python_include/fileobject.h" && cp  "/usr/include/python2.7/stringobject.h" "$(@D)/python_include/stringobject.h" && cp  "/usr/include/python2.7/timefuncs.h" "$(@D)/python_include/timefuncs.h" && cp  "/usr/include/python2.7/traceback.h" "$(@D)/python_include/traceback.h" && cp  "/usr/include/python2.7/ceval.h" "$(@D)/python_include/ceval.h" && cp  "/usr/include/python2.7/bytes_methods.h" "$(@D)/python_include/bytes_methods.h" && cp  "/usr/include/python2.7/pyconfig.h" "$(@D)/python_include/pyconfig.h" && cp  "/usr/include/python2.7/Python.h" "$(@D)/python_include/Python.h" && cp  "/usr/include/python2.7/moduleobject.h" "$(@D)/python_include/moduleobject.h" && cp  "/usr/include/python2.7/pystate.h" "$(@D)/python_include/pystate.h" && cp  "/usr/include/python2.7/descrobject.h" "$(@D)/python_include/descrobject.h" && cp  "/usr/include/python2.7/ucnhash.h" "$(@D)/python_include/ucnhash.h" && cp  "/usr/include/python2.7/pygetopt.h" "$(@D)/python_include/pygetopt.h" && cp  "/usr/include/python2.7/pymem.h" "$(@D)/python_include/pymem.h" && cp  "/usr/include/python2.7/complexobject.h" "$(@D)/python_include/complexobject.h" && cp  "/usr/include/python2.7/structseq.h" "$(@D)/python_include/structseq.h" && cp  "/usr/include/python2.7/datetime.h" "$(@D)/python_include/datetime.h" && cp  "/usr/include/python2.7/pythonrun.h" "$(@D)/python_include/pythonrun.h" && cp  "/usr/include/python2.7/numpy/oldnumeric.h" "$(@D)/python_include/numpy/oldnumeric.h" && cp  "/usr/include/python2.7/numpy/npy_1_7_deprecated_api.h" "$(@D)/python_include/numpy/npy_1_7_deprecated_api.h" && cp  "/usr/include/python2.7/numpy/ufunc_api.txt" "$(@D)/python_include/numpy/ufunc_api.txt" && cp  "/usr/include/python2.7/numpy/multiarray_api.txt" "$(@D)/python_include/numpy/multiarray_api.txt" && cp  "/usr/include/python2.7/numpy/halffloat.h" "$(@D)/python_include/numpy/halffloat.h" && cp  "/usr/include/python2.7/numpy/npy_common.h" "$(@D)/python_include/numpy/npy_common.h" && cp  "/usr/include/python2.7/numpy/utils.h" "$(@D)/python_include/numpy/utils.h" && cp  "/usr/include/python2.7/numpy/npy_interrupt.h" "$(@D)/python_include/numpy/npy_interrupt.h" && cp  "/usr/include/python2.7/numpy/npy_endian.h" "$(@D)/python_include/numpy/npy_endian.h" && cp  "/usr/include/python2.7/numpy/__ufunc_api.h" "$(@D)/python_include/numpy/__ufunc_api.h" && cp  "/usr/include/python2.7/numpy/_neighborhood_iterator_imp.h" "$(@D)/python_include/numpy/_neighborhood_iterator_imp.h" && cp  "/usr/include/python2.7/numpy/ufuncobject.h" "$(@D)/python_include/numpy/ufuncobject.h" && cp  "/usr/include/python2.7/numpy/ndarraytypes.h" "$(@D)/python_include/numpy/ndarraytypes.h" && cp  "/usr/include/python2.7/numpy/npy_math.h" "$(@D)/python_include/numpy/npy_math.h" && cp  "/usr/include/python2.7/numpy/noprefix.h" "$(@D)/python_include/numpy/noprefix.h" && cp  "/usr/include/python2.7/numpy/npy_3kcompat.h" "$(@D)/python_include/numpy/npy_3kcompat.h" && cp  "/usr/include/python2.7/numpy/arrayscalars.h" "$(@D)/python_include/numpy/arrayscalars.h" && cp  "/usr/include/python2.7/numpy/npy_os.h" "$(@D)/python_include/numpy/npy_os.h" && cp  "/usr/include/python2.7/numpy/ndarrayobject.h" "$(@D)/python_include/numpy/ndarrayobject.h" && cp  "/usr/include/python2.7/numpy/npy_no_deprecated_api.h" "$(@D)/python_include/numpy/npy_no_deprecated_api.h" && cp  "/usr/include/python2.7/numpy/arrayobject.h" "$(@D)/python_include/numpy/arrayobject.h" && cp  "/usr/include/python2.7/numpy/_numpyconfig.h" "$(@D)/python_include/numpy/_numpyconfig.h" && cp  "/usr/include/python2.7/numpy/__multiarray_api.h" "$(@D)/python_include/numpy/__multiarray_api.h" && cp  "/usr/include/python2.7/numpy/npy_cpu.h" "$(@D)/python_include/numpy/npy_cpu.h" && cp  "/usr/include/python2.7/numpy/old_defines.h" "$(@D)/python_include/numpy/old_defines.h" && cp  "/usr/include/python2.7/numpy/numpyconfig.h" "$(@D)/python_include/numpy/numpyconfig.h" && cp  "/usr/include/python2.7/pycapsule.h" "$(@D)/python_include/pycapsule.h" && cp  "/usr/include/python2.7/setobject.h" "$(@D)/python_include/setobject.h" && cp  "/usr/include/python2.7/listobject.h" "$(@D)/python_include/listobject.h" && cp  "/usr/include/python2.7/bytesobject.h" "$(@D)/python_include/bytesobject.h" && cp  "/usr/include/python2.7/pgen.h" "$(@D)/python_include/pgen.h" && cp  "/usr/include/python2.7/patchlevel.h" "$(@D)/python_include/patchlevel.h" && cp  "/usr/include/python2.7/opcode.h" "$(@D)/python_include/opcode.h" && cp  "/usr/include/python2.7/parsetok.h" "$(@D)/python_include/parsetok.h" && cp  "/usr/include/python2.7/marshal.h" "$(@D)/python_include/marshal.h" && cp  "/usr/include/python2.7/token.h" "$(@D)/python_include/token.h" && cp  "/usr/include/python2.7/iterobject.h" "$(@D)/python_include/iterobject.h" && cp  "/usr/include/python2.7/abstract.h" "$(@D)/python_include/abstract.h" && cp  "/usr/include/python2.7/py_curses.h" "$(@D)/python_include/py_curses.h" && cp  "/usr/include/python2.7/metagrammar.h" "$(@D)/python_include/metagrammar.h" && cp  "/usr/include/python2.7/bufferobject.h" "$(@D)/python_include/bufferobject.h" && cp  "/usr/include/python2.7/Python-ast.h" "$(@D)/python_include/Python-ast.h"    """,
+cp "/usr/include/python2.7/code.h" "$(@D)/python_include/code.h" && cp "/usr/include/python2.7/dtoa.h" "$(@D)/python_include/dtoa.h" && cp "/usr/include/python2.7/tupleobject.h" "$(@D)/python_include/tupleobject.h" && cp "/usr/include/python2.7/object.h" "$(@D)/python_include/object.h" && cp "/usr/include/python2.7/ast.h" "$(@D)/python_include/ast.h" && cp "/usr/include/python2.7/pymacconfig.h" "$(@D)/python_include/pymacconfig.h" && cp "/usr/include/python2.7/errcode.h" "$(@D)/python_include/errcode.h" && cp "/usr/include/python2.7/frameobject.h" "$(@D)/python_include/frameobject.h" && cp "/usr/include/python2.7/pgenheaders.h" "$(@D)/python_include/pgenheaders.h" && cp "/usr/include/python2.7/cellobject.h" "$(@D)/python_include/cellobject.h" && cp "/usr/include/python2.7/intobject.h" "$(@D)/python_include/intobject.h" && cp "/usr/include/python2.7/pythread.h" "$(@D)/python_include/pythread.h" && cp "/usr/include/python2.7/cStringIO.h" "$(@D)/python_include/cStringIO.h" && cp "/usr/include/python2.7/boolobject.h" "$(@D)/python_include/boolobject.h" && cp "/usr/include/python2.7/modsupport.h" "$(@D)/python_include/modsupport.h" && cp "/usr/include/python2.7/import.h" "$(@D)/python_include/import.h" && cp "/usr/include/python2.7/pymath.h" "$(@D)/python_include/pymath.h" && cp "/usr/include/python2.7/node.h" "$(@D)/python_include/node.h" && cp "/usr/include/python2.7/funcobject.h" "$(@D)/python_include/funcobject.h" && cp "/usr/include/python2.7/eval.h" "$(@D)/python_include/eval.h" && cp "/usr/include/python2.7/longintrepr.h" "$(@D)/python_include/longintrepr.h" && cp "/usr/include/python2.7/floatobject.h" "$(@D)/python_include/floatobject.h" && cp "/usr/include/python2.7/rangeobject.h" "$(@D)/python_include/rangeobject.h" && cp "/usr/include/python2.7/pyfpe.h" "$(@D)/python_include/pyfpe.h" && cp "/usr/include/python2.7/pystrcmp.h" "$(@D)/python_include/pystrcmp.h" && cp "/usr/include/python2.7/dictobject.h" "$(@D)/python_include/dictobject.h" && cp "/usr/include/python2.7/pyarena.h" "$(@D)/python_include/pyarena.h" && cp "/usr/include/python2.7/objimpl.h" "$(@D)/python_include/objimpl.h" && cp "/usr/include/python2.7/bitset.h" "$(@D)/python_include/bitset.h" && cp "/usr/include/python2.7/memoryobject.h" "$(@D)/python_include/memoryobject.h" && cp "/usr/include/python2.7/bytearrayobject.h" "$(@D)/python_include/bytearrayobject.h" && cp "/usr/include/python2.7/pydebug.h" "$(@D)/python_include/pydebug.h" && cp "/usr/include/python2.7/pyerrors.h" "$(@D)/python_include/pyerrors.h" && cp "/usr/include/python2.7/weakrefobject.h" "$(@D)/python_include/weakrefobject.h" && cp "/usr/include/python2.7/grammar.h" "$(@D)/python_include/grammar.h" && cp "/usr/include/python2.7/symtable.h" "$(@D)/python_include/symtable.h" && cp "/usr/include/python2.7/longobject.h" "$(@D)/python_include/longobject.h" && cp "/usr/include/python2.7/structmember.h" "$(@D)/python_include/structmember.h" && cp "/usr/include/python2.7/enumobject.h" "$(@D)/python_include/enumobject.h" && cp "/usr/include/python2.7/classobject.h" "$(@D)/python_include/classobject.h" && cp "/usr/include/python2.7/unicodeobject.h" "$(@D)/python_include/unicodeobject.h" && cp "/usr/include/python2.7/sliceobject.h" "$(@D)/python_include/sliceobject.h" && cp "/usr/include/python2.7/pystrtod.h" "$(@D)/python_include/pystrtod.h" && cp "/usr/include/python2.7/genobject.h" "$(@D)/python_include/genobject.h" && cp "/usr/include/python2.7/pymactoolbox.h" "$(@D)/python_include/pymactoolbox.h" && cp "/usr/include/python2.7/compile.h" "$(@D)/python_include/compile.h" && cp "/usr/include/python2.7/pyexpat.h" "$(@D)/python_include/pyexpat.h" && cp "/usr/include/python2.7/asdl.h" "$(@D)/python_include/asdl.h" && cp "/usr/include/python2.7/codecs.h" "$(@D)/python_include/codecs.h" && cp "/usr/include/python2.7/pyctype.h" "$(@D)/python_include/pyctype.h" && cp "/usr/include/python2.7/sysmodule.h" "$(@D)/python_include/sysmodule.h" && cp "/usr/include/python2.7/methodobject.h" "$(@D)/python_include/methodobject.h" && cp "/usr/include/python2.7/graminit.h" "$(@D)/python_include/graminit.h" && cp "/usr/include/python2.7/cobject.h" "$(@D)/python_include/cobject.h" && cp "/usr/include/python2.7/intrcheck.h" "$(@D)/python_include/intrcheck.h" && cp "/usr/include/python2.7/pyport.h" "$(@D)/python_include/pyport.h" && cp "/usr/include/python2.7/warnings.h" "$(@D)/python_include/warnings.h" && cp "/usr/include/python2.7/osdefs.h" "$(@D)/python_include/osdefs.h" && cp "/usr/include/python2.7/fileobject.h" "$(@D)/python_include/fileobject.h" && cp "/usr/include/python2.7/stringobject.h" "$(@D)/python_include/stringobject.h" && cp "/usr/include/python2.7/timefuncs.h" "$(@D)/python_include/timefuncs.h" && cp "/usr/include/python2.7/traceback.h" "$(@D)/python_include/traceback.h" && cp "/usr/include/python2.7/ceval.h" "$(@D)/python_include/ceval.h" && cp "/usr/include/python2.7/bytes_methods.h" "$(@D)/python_include/bytes_methods.h" && cp "/usr/include/python2.7/pyconfig.h" "$(@D)/python_include/pyconfig.h" && cp "/usr/include/python2.7/Python.h" "$(@D)/python_include/Python.h" && cp "/usr/include/python2.7/moduleobject.h" "$(@D)/python_include/moduleobject.h" && cp "/usr/include/python2.7/pystate.h" "$(@D)/python_include/pystate.h" && cp "/usr/include/python2.7/descrobject.h" "$(@D)/python_include/descrobject.h" && cp "/usr/include/python2.7/ucnhash.h" "$(@D)/python_include/ucnhash.h" && cp "/usr/include/python2.7/pygetopt.h" "$(@D)/python_include/pygetopt.h" && cp "/usr/include/python2.7/pymem.h" "$(@D)/python_include/pymem.h" && cp "/usr/include/python2.7/complexobject.h" "$(@D)/python_include/complexobject.h" && cp "/usr/include/python2.7/structseq.h" "$(@D)/python_include/structseq.h" && cp "/usr/include/python2.7/datetime.h" "$(@D)/python_include/datetime.h" && cp "/usr/include/python2.7/pythonrun.h" "$(@D)/python_include/pythonrun.h" && cp "/usr/include/python2.7/numpy/oldnumeric.h" "$(@D)/python_include/numpy/oldnumeric.h" && cp "/usr/include/python2.7/numpy/npy_1_7_deprecated_api.h" "$(@D)/python_include/numpy/npy_1_7_deprecated_api.h" && cp "/usr/include/python2.7/numpy/ufunc_api.txt" "$(@D)/python_include/numpy/ufunc_api.txt" && cp "/usr/include/python2.7/numpy/multiarray_api.txt" "$(@D)/python_include/numpy/multiarray_api.txt" && cp "/usr/include/python2.7/numpy/halffloat.h" "$(@D)/python_include/numpy/halffloat.h" && cp "/usr/include/python2.7/numpy/npy_common.h" "$(@D)/python_include/numpy/npy_common.h" && cp "/usr/include/python2.7/numpy/utils.h" "$(@D)/python_include/numpy/utils.h" && cp "/usr/include/python2.7/numpy/npy_interrupt.h" "$(@D)/python_include/numpy/npy_interrupt.h" && cp "/usr/include/python2.7/numpy/npy_endian.h" "$(@D)/python_include/numpy/npy_endian.h" && cp "/usr/include/python2.7/numpy/__ufunc_api.h" "$(@D)/python_include/numpy/__ufunc_api.h" && cp "/usr/include/python2.7/numpy/_neighborhood_iterator_imp.h" "$(@D)/python_include/numpy/_neighborhood_iterator_imp.h" && cp "/usr/include/python2.7/numpy/ufuncobject.h" "$(@D)/python_include/numpy/ufuncobject.h" && cp "/usr/include/python2.7/numpy/ndarraytypes.h" "$(@D)/python_include/numpy/ndarraytypes.h" && cp "/usr/include/python2.7/numpy/npy_math.h" "$(@D)/python_include/numpy/npy_math.h" && cp "/usr/include/python2.7/numpy/noprefix.h" "$(@D)/python_include/numpy/noprefix.h" && cp "/usr/include/python2.7/numpy/npy_3kcompat.h" "$(@D)/python_include/numpy/npy_3kcompat.h" && cp "/usr/include/python2.7/numpy/arrayscalars.h" "$(@D)/python_include/numpy/arrayscalars.h" && cp "/usr/include/python2.7/numpy/npy_os.h" "$(@D)/python_include/numpy/npy_os.h" && cp "/usr/include/python2.7/numpy/ndarrayobject.h" "$(@D)/python_include/numpy/ndarrayobject.h" && cp "/usr/include/python2.7/numpy/npy_no_deprecated_api.h" "$(@D)/python_include/numpy/npy_no_deprecated_api.h" && cp "/usr/include/python2.7/numpy/arrayobject.h" "$(@D)/python_include/numpy/arrayobject.h" && cp "/usr/include/python2.7/numpy/_numpyconfig.h" "$(@D)/python_include/numpy/_numpyconfig.h" && cp "/usr/include/python2.7/numpy/__multiarray_api.h" "$(@D)/python_include/numpy/__multiarray_api.h" && cp "/usr/include/python2.7/numpy/npy_cpu.h" "$(@D)/python_include/numpy/npy_cpu.h" && cp "/usr/include/python2.7/numpy/old_defines.h" "$(@D)/python_include/numpy/old_defines.h" && cp "/usr/include/python2.7/numpy/numpyconfig.h" "$(@D)/python_include/numpy/numpyconfig.h" && cp "/usr/include/python2.7/pycapsule.h" "$(@D)/python_include/pycapsule.h" && cp "/usr/include/python2.7/setobject.h" "$(@D)/python_include/setobject.h" && cp "/usr/include/python2.7/listobject.h" "$(@D)/python_include/listobject.h" && cp "/usr/include/python2.7/bytesobject.h" "$(@D)/python_include/bytesobject.h" && cp "/usr/include/python2.7/pgen.h" "$(@D)/python_include/pgen.h" && cp "/usr/include/python2.7/patchlevel.h" "$(@D)/python_include/patchlevel.h" && cp "/usr/include/python2.7/opcode.h" "$(@D)/python_include/opcode.h" && cp "/usr/include/python2.7/parsetok.h" "$(@D)/python_include/parsetok.h" && cp "/usr/include/python2.7/marshal.h" "$(@D)/python_include/marshal.h" && cp "/usr/include/python2.7/token.h" "$(@D)/python_include/token.h" && cp "/usr/include/python2.7/iterobject.h" "$(@D)/python_include/iterobject.h" && cp "/usr/include/python2.7/abstract.h" "$(@D)/python_include/abstract.h" && cp "/usr/include/python2.7/py_curses.h" "$(@D)/python_include/py_curses.h" && cp "/usr/include/python2.7/metagrammar.h" "$(@D)/python_include/metagrammar.h" && cp "/usr/include/python2.7/bufferobject.h" "$(@D)/python_include/bufferobject.h" && cp "/usr/include/python2.7/Python-ast.h" "$(@D)/python_include/Python-ast.h"
+   """,
 )
 
 genrule(
@@ -181,5 +192,6 @@ genrule(
         "numpy_include/numpy/numpyconfig.h",
     ],
     cmd = """
-cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/oldnumeric.h" "$(@D)/numpy_include/numpy/oldnumeric.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/npy_1_7_deprecated_api.h" "$(@D)/numpy_include/numpy/npy_1_7_deprecated_api.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/ufunc_api.txt" "$(@D)/numpy_include/numpy/ufunc_api.txt" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/multiarray_api.txt" "$(@D)/numpy_include/numpy/multiarray_api.txt" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/halffloat.h" "$(@D)/numpy_include/numpy/halffloat.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/npy_common.h" "$(@D)/numpy_include/numpy/npy_common.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/utils.h" "$(@D)/numpy_include/numpy/utils.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/npy_interrupt.h" "$(@D)/numpy_include/numpy/npy_interrupt.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/npy_endian.h" "$(@D)/numpy_include/numpy/npy_endian.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/__ufunc_api.h" "$(@D)/numpy_include/numpy/__ufunc_api.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/_neighborhood_iterator_imp.h" "$(@D)/numpy_include/numpy/_neighborhood_iterator_imp.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/ufuncobject.h" "$(@D)/numpy_include/numpy/ufuncobject.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/ndarraytypes.h" "$(@D)/numpy_include/numpy/ndarraytypes.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/npy_math.h" "$(@D)/numpy_include/numpy/npy_math.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/noprefix.h" "$(@D)/numpy_include/numpy/noprefix.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/npy_3kcompat.h" "$(@D)/numpy_include/numpy/npy_3kcompat.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/arrayscalars.h" "$(@D)/numpy_include/numpy/arrayscalars.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/npy_os.h" "$(@D)/numpy_include/numpy/npy_os.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/ndarrayobject.h" "$(@D)/numpy_include/numpy/ndarrayobject.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/npy_no_deprecated_api.h" "$(@D)/numpy_include/numpy/npy_no_deprecated_api.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/arrayobject.h" "$(@D)/numpy_include/numpy/arrayobject.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/_numpyconfig.h" "$(@D)/numpy_include/numpy/_numpyconfig.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/__multiarray_api.h" "$(@D)/numpy_include/numpy/__multiarray_api.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/npy_cpu.h" "$(@D)/numpy_include/numpy/npy_cpu.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/old_defines.h" "$(@D)/numpy_include/numpy/old_defines.h" && cp  "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/numpyconfig.h" "$(@D)/numpy_include/numpy/numpyconfig.h"    """,
+cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/oldnumeric.h" "$(@D)/numpy_include/numpy/oldnumeric.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/npy_1_7_deprecated_api.h" "$(@D)/numpy_include/numpy/npy_1_7_deprecated_api.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/ufunc_api.txt" "$(@D)/numpy_include/numpy/ufunc_api.txt" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/multiarray_api.txt" "$(@D)/numpy_include/numpy/multiarray_api.txt" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/halffloat.h" "$(@D)/numpy_include/numpy/halffloat.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/npy_common.h" "$(@D)/numpy_include/numpy/npy_common.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/utils.h" "$(@D)/numpy_include/numpy/utils.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/npy_interrupt.h" "$(@D)/numpy_include/numpy/npy_interrupt.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/npy_endian.h" "$(@D)/numpy_include/numpy/npy_endian.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/__ufunc_api.h" "$(@D)/numpy_include/numpy/__ufunc_api.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/_neighborhood_iterator_imp.h" "$(@D)/numpy_include/numpy/_neighborhood_iterator_imp.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/ufuncobject.h" "$(@D)/numpy_include/numpy/ufuncobject.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/ndarraytypes.h" "$(@D)/numpy_include/numpy/ndarraytypes.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/npy_math.h" "$(@D)/numpy_include/numpy/npy_math.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/noprefix.h" "$(@D)/numpy_include/numpy/noprefix.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/npy_3kcompat.h" "$(@D)/numpy_include/numpy/npy_3kcompat.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/arrayscalars.h" "$(@D)/numpy_include/numpy/arrayscalars.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/npy_os.h" "$(@D)/numpy_include/numpy/npy_os.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/ndarrayobject.h" "$(@D)/numpy_include/numpy/ndarrayobject.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/npy_no_deprecated_api.h" "$(@D)/numpy_include/numpy/npy_no_deprecated_api.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/arrayobject.h" "$(@D)/numpy_include/numpy/arrayobject.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/_numpyconfig.h" "$(@D)/numpy_include/numpy/_numpyconfig.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/__multiarray_api.h" "$(@D)/numpy_include/numpy/__multiarray_api.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/npy_cpu.h" "$(@D)/numpy_include/numpy/npy_cpu.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/old_defines.h" "$(@D)/numpy_include/numpy/old_defines.h" && cp "/usr/lib/python2.7/dist-packages/numpy/core/include/numpy/numpyconfig.h" "$(@D)/numpy_include/numpy/numpyconfig.h"
+   """,
 )