ld-tool portability fix: MacOS build experience

* fix: makefile fail to build due to line feed character not being
       recognise as valid separator

* change shebang to more portable of /usr/bin/env

diff --git a/lunaix-os/kernel.mk b/lunaix-os/kernel.mk
index dff0de2f326750c4bc230fad7c2bbb1b624ae8ab..86f4668910c098fcb70610f4b93a859d5226fb73 100644 (file)
--- a/lunaix-os/kernel.mk
+++ b/lunaix-os/kernel.mk
@@ -19,11 +19,11 @@ CFLAGS += $(khdr_opts) $(kinc_opts) $(config_h) -MMD -MP
 
 -include $(ksrc_deps)
 
 
 -include $(ksrc_deps)
 

-%.S.o: %.S $(khdr_files) kernel.mk
+%.S.o: %.S kernel.mk

        $(call status_,AS,$<)
        @$(CC) $(CFLAGS) -c $< -o $@
 
        $(call status_,AS,$<)
        @$(CC) $(CFLAGS) -c $< -o $@
 

-%.c.o: %.c $(khdr_files) kernel.mk
+%.c.o: %.c kernel.mk

        $(call status_,CC,$<)
        @$(CC) $(CFLAGS) -c $< -o $@
 
        $(call status_,CC,$<)
        @$(CC) $(CFLAGS) -c $< -o $@
 

diff --git a/lunaix-os/scripts/build-tools/integration/build_gen.py b/lunaix-os/scripts/build-tools/integration/build_gen.py
index 83c99042b64263ae13a043dd90ac525293b4216d..6b1cde722442d0ab2672f7d575d371246102338e 100644 (file)
--- a/lunaix-os/scripts/build-tools/integration/build_gen.py
+++ b/lunaix-os/scripts/build-tools/integration/build_gen.py
@@ -9,11 +9,10 @@ class MakefileBuildGen(BuildGenerator):
     
     def emit_makearray(self, name, values):
         r = []
     
     def emit_makearray(self, name, values):
         r = []

-        r.append(f"define {name}")
+        r.append(f"{name} :=")

         for v in values:
         for v in values:

-            r.append(v)
-        r.append("endef")
-        return r
+            r.append(f"{v}")
+        return [" ".join(r)]

 
     def generate(self, env: BuildEnvironment):
         path = env.to_wspath(self.__path)
 
     def generate(self, env: BuildEnvironment):
         path = env.to_wspath(self.__path)

diff --git a/lunaix-os/scripts/gen_ksymtable.sh b/lunaix-os/scripts/gen_ksymtable.sh
index 6b59e4d71ea0eaba6daa95d35e99bdc3a5dad2a7..720dc5537cd20b53eed859830893b04a32fc0017 100755 (executable)
--- a/lunaix-os/scripts/gen_ksymtable.sh
+++ b/lunaix-os/scripts/gen_ksymtable.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 
 sym_types=$1
 bin=$2
 
 sym_types=$1
 bin=$2