|
@@ -1,4 +1,3 @@
|
|
|
-import("//Meta/gn/build/serenity_target.gni")
|
|
|
import("//Meta/gn/build/toolchain/compiler.gni")
|
|
|
|
|
|
unix_copy_command = "ln -f {{source}} {{output}} 2>/dev/null || (rm -rf {{output}} && cp -af {{source}} {{output}})"
|
|
@@ -76,13 +75,8 @@ template("unix_toolchain") {
|
|
|
}
|
|
|
description = "AR {{output}}"
|
|
|
outputs = [ "{{output_dir}}/{{target_output_name}}.a" ]
|
|
|
- output_prefix = "lib"
|
|
|
- if (current_os == "serenity") {
|
|
|
- default_output_dir = "{{target_out_dir}}"
|
|
|
- } else {
|
|
|
- output_prefix = "liblagom-"
|
|
|
- default_output_dir = "{{root_out_dir}}/lib"
|
|
|
- }
|
|
|
+ output_prefix = "liblagom-"
|
|
|
+ default_output_dir = "{{root_out_dir}}/lib"
|
|
|
}
|
|
|
|
|
|
# Make these apply to all tools below.
|
|
@@ -100,13 +94,8 @@ template("unix_toolchain") {
|
|
|
}
|
|
|
description = "SOLINK $outfile"
|
|
|
outputs = [ outfile ]
|
|
|
- output_prefix = "lib"
|
|
|
- if (current_os == "serenity") {
|
|
|
- default_output_dir = "{{target_out_dir}}"
|
|
|
- } else {
|
|
|
- output_prefix = "liblagom-"
|
|
|
- default_output_dir = "{{root_out_dir}}/lib"
|
|
|
- }
|
|
|
+ output_prefix = "liblagom-"
|
|
|
+ default_output_dir = "{{root_out_dir}}/lib"
|
|
|
}
|
|
|
|
|
|
tool("solink_module") {
|
|
@@ -120,12 +109,8 @@ template("unix_toolchain") {
|
|
|
}
|
|
|
description = "SOLINK $outfile"
|
|
|
outputs = [ outfile ]
|
|
|
- if (current_os == "serenity") {
|
|
|
- default_output_dir = "{{target_out_dir}}"
|
|
|
- } else {
|
|
|
- output_prefix = "lagom-"
|
|
|
- default_output_dir = "{{root_out_dir}}/lib"
|
|
|
- }
|
|
|
+ output_prefix = "lagom-"
|
|
|
+ default_output_dir = "{{root_out_dir}}/lib"
|
|
|
}
|
|
|
|
|
|
tool("link") {
|
|
@@ -140,14 +125,7 @@ template("unix_toolchain") {
|
|
|
}
|
|
|
description = "LINK $outfile"
|
|
|
outputs = [ outfile ]
|
|
|
-
|
|
|
- if (current_os == "serenity") {
|
|
|
- # Setting this allows targets to override the default executable output by
|
|
|
- # setting output_dir.
|
|
|
- default_output_dir = "{{target_out_dir}}"
|
|
|
- } else {
|
|
|
- default_output_dir = "{{root_out_dir}}/bin"
|
|
|
- }
|
|
|
+ default_output_dir = "{{root_out_dir}}/bin"
|
|
|
}
|
|
|
|
|
|
tool("copy") {
|
|
@@ -166,7 +144,7 @@ template("unix_toolchain") {
|
|
|
}
|
|
|
tool("compile_xcassets") {
|
|
|
command = "false"
|
|
|
- description = "The serenity build doesn't use any xcasset files"
|
|
|
+ description = "The Ladybird build doesn't use any xcasset files"
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -193,15 +171,3 @@ unix_toolchain("unix") {
|
|
|
ld = host_cxx
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-unix_toolchain("serenity") {
|
|
|
- cc = serenity_cc
|
|
|
- cxx = serenity_cxx
|
|
|
- ld = serenity_ld
|
|
|
- toolchain_args = {
|
|
|
- current_os = "serenity"
|
|
|
- current_cpu = serenity_arch
|
|
|
- is_clang = serenity_toolchain == "Clang"
|
|
|
- use_lld = is_clang
|
|
|
- }
|
|
|
-}
|