From ba018197c694903e3f0ba4478aedd14eb43adb9a Mon Sep 17 00:00:00 2001 From: 0CodErr <0CodErr@kolibrios.org> Date: Sat, 3 Feb 2018 09:10:21 +0000 Subject: [PATCH] add CONFIG_NO_JWASM to tup.config.template; check GCC in RunOD tupfile git-svn-id: svn://kolibrios.org@7145 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/system/RunOD/1/Tupfile.lua | 2 +- tup.config.template | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/system/RunOD/1/Tupfile.lua b/programs/system/RunOD/1/Tupfile.lua index 783e2fdfcd..13f65d2261 100644 --- a/programs/system/RunOD/1/Tupfile.lua +++ b/programs/system/RunOD/1/Tupfile.lua @@ -1,4 +1,4 @@ -if tup.getconfig('NO_JWASM') ~= "" then return end +if tup.getconfig('NO_JWASM') ~= "" or tup.getconfig("NO_GCC") ~= "" then return end if tup.getconfig("LANG") == "it" then tup.definerule{command = "echo LANG_IT = 1 > lang.inc", outputs = {"lang.inc"}} diff --git a/tup.config.template b/tup.config.template index 222123d588..ee1c0fb107 100644 --- a/tup.config.template +++ b/tup.config.template @@ -16,6 +16,7 @@ ### and still want to have them in final images. # CONFIG_NO_FASM=full # CONFIG_NO_NASM=full +# CONFIG_NO_JWASM=full # CONFIG_NO_GCC=full # CONFIG_NO_MSVC=full # CONFIG_NO_CMM=full