fix install directory and modify compiler and linker interfaces

2 files changed, 32 insertions, 0 deletions

diff --git a/xmake/core/sandbox/modules/import/core/tool/compiler.lua b/xmake/core/sandbox/modules/import/core/tool/compiler.lua
index bf231f7b4..71059ad16 100644
--- a/xmake/core/sandbox/modules/import/core/tool/compiler.lua
+++ b/xmake/core/sandbox/modules/import/core/tool/compiler.lua
@@ -41,5 +41,21 @@ function sandbox_core_tool_compiler.compcmd(sourcefile, objectfile, target)
     return instance:compcmd(sourcefile, objectfile, target)
 end
 
+-- compile source file
+function sandbox_core_tool_compiler.compile(sourcefile, objectfile, target, multitasking)
+ 
+    -- get the compiler instance
+    local instance, errors = compiler.load(compiler.kind_of_file(sourcefile))
+    if not instance then
+        raise(errors)
+    end
+
+    -- compile it
+    local ok, errors = instance:compile(sourcefile, objectfile, target, multitasking)
+    if not ok then
+        raise(errors)
+    end
+end
+
 -- return module
 return sandbox_core_tool_compiler
diff --git a/xmake/core/sandbox/modules/import/core/tool/linker.lua b/xmake/core/sandbox/modules/import/core/tool/linker.lua
index 9f42a04e7..5f9a32f96 100644
--- a/xmake/core/sandbox/modules/import/core/tool/linker.lua
+++ b/xmake/core/sandbox/modules/import/core/tool/linker.lua
@@ -41,5 +41,21 @@ function sandbox_core_tool_linker.linkcmd(objectfiles, targetfile, target)
     return instance:linkcmd(objectfiles, targetfile, target)
 end
 
+-- link target file
+function sandbox_core_tool_linker.link(objectfiles, targetfile, target)
+ 
+    -- get the linker instance
+    local instance, errors = linker.load(target:get("kind"))
+    if not instance then
+        raise(errors)
+    end
+
+    -- link it
+    local ok, errors = instance:link(objectfiles, targetfile, target)
+    if not ok then
+        raise(errors)
+    end
+end
+
 -- return module
 return sandbox_core_tool_linker