From: Evgeny Vrublevsky Date: Thu, 18 Oct 2018 10:16:48 +0000 (+0300) Subject: Renamed to '--no-std-lib' X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8084702a58b3c5b669b735a98db7c9c14e383529;p=cc65 Renamed to '--no-std-lib' --- diff --git a/doc/cl65.sgml b/doc/cl65.sgml index 4591b42f7..a2413fe7a 100644 --- a/doc/cl65.sgml +++ b/doc/cl65.sgml @@ -103,7 +103,7 @@ Long options: --memory-model model Set the memory model --module Link as a module --module-id id Specify a module id for the linker - --no-crt-lib Don't link default C runtime library + --no-std-lib Don't link standard runtime library --o65-model model Override the o65 model --obj file Link this object file --obj-path path Specify an object file search path @@ -186,9 +186,10 @@ There are a few remaining options that control the behaviour of cl65: seem to use cc65 to develop for the C64. - --no-crt-lib + --no-std-lib - This option tells the cl65 to not include default C runtime library into the list of libraries. + This option tells the cl65 to not include standard runtime library into the + list of libraries. diff --git a/src/cl65/main.c b/src/cl65/main.c index badf15585..c2f09323b 100644 --- a/src/cl65/main.c +++ b/src/cl65/main.c @@ -139,7 +139,7 @@ static int Module = 0; /* Name of the target specific runtime library */ static char* TargetLib = 0; -static int NoCrtLib = 0; +static int NoStdLib = 0; @@ -492,20 +492,20 @@ static void Link (void) CmdSetTarget (&LD65, Target); } - if (!NoCrtLib) - { - /* Determine which target libraries are needed */ - SetTargetFiles (); - } - /* Add all object files as parameters */ for (I = 0; I < LD65.FileCount; ++I) { CmdAddArg (&LD65, LD65.Files [I]); } - /* Add the system runtime library */ - if (TargetLib) { - CmdAddArg (&LD65, TargetLib); + /* Add the standard runtime library if it is not disabled */ + if (!NoStdLib) + { + /* Determine which target library is needed */ + SetTargetFiles (); + + if (TargetLib) { + CmdAddArg (&LD65, TargetLib); + } } /* Terminate the argument list with a NULL pointer */ @@ -816,7 +816,7 @@ static void Usage (void) " --memory-model model\t\tSet the memory model\n" " --module\t\t\tLink as a module\n" " --module-id id\t\tSpecify a module ID for the linker\n" - " --no-crt-lib\t\t\tDon't link default C runtime library\n" + " --no-std-lib\t\t\tDon't link standard runtime library\n" " --o65-model model\t\tOverride the o65 model\n" " --obj file\t\t\tLink this object file\n" " --obj-path path\t\tSpecify an object file search path\n" @@ -1172,11 +1172,11 @@ static void OptModuleId (const char* Opt attribute ((unused)), const char* Arg) -static void OptNoCrtLib (const char* Opt attribute ((unused)), - const char* Arg attribute ((unused))) -/* Disable default runtime library */ +static void OptNoStdLib (const char* Opt attribute ((unused)), + const char* Arg attribute ((unused))) +/* Disable standard runtime library */ { - NoCrtLib = 1; + NoStdLib = 1; } @@ -1383,7 +1383,7 @@ int main (int argc, char* argv []) { "--memory-model", 1, OptMemoryModel }, { "--module", 0, OptModule }, { "--module-id", 1, OptModuleId }, - { "--no-crt-lib", 0, OptNoCrtLib }, + { "--no-std-lib", 0, OptNoStdLib }, { "--o65-model", 1, OptO65Model }, { "--obj", 1, OptObj }, { "--obj-path", 1, OptObjPath },