diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-11-26 00:22:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-26 00:22:41 -0500 |
| commit | b40cc41a6bfaf3769f9738476825a17b864e514e (patch) | |
| tree | 04bb3b30943b5e8e176a803fd1d192015d533cbe /src | |
| parent | 286c9c16a42399716b4ecaa7cab902e5434fa0a6 (diff) | |
| parent | 004b9ea7cec20d0a02ea7b8a53636e6670137215 (diff) | |
Merge pull request #84 from nekernel-org/devv0.0.7
fix: boot/bootnet: fix linking error on bootnet module.
Diffstat (limited to 'src')
| -rw-r--r-- | src/boot/modules/BootNet/amd64.json | 19 | ||||
| -rw-r--r-- | src/boot/src/BootSupport.cc | 1 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/boot/modules/BootNet/amd64.json b/src/boot/modules/BootNet/amd64.json index 3d58cbc1..c0037580 100644 --- a/src/boot/modules/BootNet/amd64.json +++ b/src/boot/modules/BootNet/amd64.json @@ -1,8 +1,20 @@ { "compiler_path": "x86_64-w64-mingw32-g++", "compiler_std": "c++20", - "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"], - "sources_path": ["*.cc", "*.S", "../../src/HEL/AMD64/*.cc", "../../src/HEL/AMD64/*.S", "../../src/*.cc"], + "headers_path": [ + "../", + "../../", + "../../../kernel", + "../../../", + "./" + ], + "sources_path": [ + "*.cc", + "*.S", + "../../src/HEL/AMD64/*.cc", + "../../src/HEL/AMD64/*.S", + "../../src/*.cc" + ], "output_name": "net.efi", "compiler_flags": [ "-nostdlib", @@ -12,7 +24,6 @@ "-Wl,--subsystem=17,--image-base,0x10000000,-e,BootNetModuleMain" ], "cpp_macros": [ - "__NEOSKRNL__", "__BOOTZ__", "__BOOTZ_STANDALONE__", "__NE_AMD64__", @@ -20,4 +31,4 @@ "kBootNetVersionLowest=0x0100", "kBootNetEFIVersion=0x0100" ] -} +}
\ No newline at end of file diff --git a/src/boot/src/BootSupport.cc b/src/boot/src/BootSupport.cc index 24e09094..c7c86ea2 100644 --- a/src/boot/src/BootSupport.cc +++ b/src/boot/src/BootSupport.cc @@ -13,6 +13,7 @@ #include <KernelKit/PE.h> #ifdef __BOOTZ_STANDALONE__ +EXTERN_C int atexit(void (*f)()) { return 0; } /// @brief memset definition in C++. /// @param dst destination pointer. |