rabe: fix native install

Author: csegarragonz

tasks/rabe.py

@@ -24,15 +24,25 @@ def build(ctx, clean=False, native=False):
 
     run(cargo_cmd, shell=True, check=True, cwd=rabe_dir)
 
+    lib_dir = "/usr/local/lib/rabe"
+    header_dir = "/usr/include/rabe"
     if not native:
-        # Install it in the WASM sysroot
         build_env = get_faasm_build_env_dict()
+        lib_dir = build_env["FAASM_WASM_LIB_INSTALL_DIR"]
+        header_dir = build_env["FAASM_WASM_HEADER_INSTALL_DIR"]
+    else:
+        if not exists(lib_dir):
+            makedirs(lib_dir)
+        if not exists(header_dir):
+            makedirs(header_dir)
 
+    if not native:
+        src_lib = join(rabe_dir, "target", "wasm32-wasip1", "release", "librabe.a")
+    else:
         src_lib = join(rabe_dir, "target", "wasm32-wasip1", "release", "librabe.a")
-        dst_lib = join(build_env["FAASM_WASM_LIB_INSTALL_DIR"], "librabe.a")
 
-        # TODO: move down
-        copy(src_lib, dst_lib)
+    dst_lib = join(lib_dir, "librabe.a")
+    copy(src_lib, dst_lib)
 
     # Build the CPP bindings library, and cross-compile it to WASM
     rabe_cpp_dir = join(rabe_dir, "cpp-bindings")
@@ -59,26 +69,18 @@ def build(ctx, clean=False, native=False):
 
     work_env = environ.copy()
     work_env.update(get_faasm_build_env_dict())
-    print(build_dir)
     run(cmake_cmd, shell=True, check=True, cwd=build_dir, env=work_env)
     run("ninja", shell=True, check=True, cwd=build_dir)
 
-    if not native:
-        build_env = get_faasm_build_env_dict()
-
-        # Install the library in the WASM sysroot
-        src_lib = join(build_dir, "librabe-cpp.a")
-        dst_lib = join(build_env["FAASM_WASM_LIB_INSTALL_DIR"], "librabe-cpp.a")
-        copy(src_lib, dst_lib)
-
-        # Install the header in the WASM sysroot too
-        src_header = join(rabe_cpp_dir, "rabe_bindings.hpp")
-        dst_header = join(
-            build_env["FAASM_WASM_HEADER_INSTALL_DIR"], "tless_abe.h"
-        )
-        copy(src_header, dst_header)
-        src_header = join(rabe_cpp_dir, "tless_aes.h")
-        dst_header = join(
-            build_env["FAASM_WASM_HEADER_INSTALL_DIR"], "tless_aes.h"
-        )
-        copy(src_header, dst_header)
+    # Install the CPP bindings library
+    src_lib = join(build_dir, "librabe-cpp.a")
+    dst_lib = join(lib_dir, "librabe-cpp.a")
+    copy(src_lib, dst_lib)
+
+    # Install the headers
+    src_header = join(rabe_cpp_dir, "rabe_bindings.hpp")
+    dst_header = join(header_dir, "tless_abe.h")
+    copy(src_header, dst_header)
+    src_header = join(rabe_cpp_dir, "tless_aes.h")
+    dst_header = join(header_dir, "tless_aes.h")
+    copy(src_header, dst_header)