diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
| commit | f6c5a79972bcd216429484eb706fc47c7bb52a75 (patch) | |
| tree | 4f5e17701c66df5d2359486687f1fd41b2fb469e /tools/adk/pkgmaker.c | |
| parent | 00fa581bc6acc3158b3008019e81802a5d70418c (diff) | |
| parent | b8e1fbce6811e906e7c8bd21f4e7fe1aa4881585 (diff) | |
resolve merge conflict
Diffstat (limited to 'tools/adk/pkgmaker.c')
| -rw-r--r-- | tools/adk/pkgmaker.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tools/adk/pkgmaker.c b/tools/adk/pkgmaker.c index d2c444f4f..51d31aa70 100644 --- a/tools/adk/pkgmaker.c +++ b/tools/adk/pkgmaker.c @@ -394,13 +394,6 @@ int main() { fprintf(cfg, "\tdepends on ADK_TARGET_LIB_GLIBC\n"); fprintf(cfg, "\thelp\n"); fprintf(cfg, "\t GNU C library header files.\n\n"); - fprintf(cfg, "config ADK_PACKAGE_EGLIBC_DEV\n"); - fprintf(cfg, "\tprompt \"eglibc-dev........... development files for eglibc\"\n"); - fprintf(cfg, "\ttristate\n"); - fprintf(cfg, "\tdefault n\n"); - fprintf(cfg, "\tdepends on ADK_TARGET_LIB_EGLIBC\n"); - fprintf(cfg, "\thelp\n"); - fprintf(cfg, "\t GNU C library header files.\n\n"); fprintf(cfg, "config ADK_PACKAGE_UCLIBC_DEV\n"); fprintf(cfg, "\tprompt \"uclibc-dev........... development files for uclibc\"\n"); fprintf(cfg, "\ttristate\n"); @@ -873,7 +866,7 @@ int main() { fprintf(cfg, "\nchoice\n"); fprintf(cfg, "prompt \"C++ library to use\"\n"); fprintf(cfg, "depends on ADK_COMPILE_%s\n\n", toupperstr(pkgdirp->d_name)); - fprintf(cfg, "default ADK_COMPILE_%s_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC\n", pkg_cxx); + fprintf(cfg, "default ADK_COMPILE_%s_WITH_STDCXX if ADK_TARGET_LIB_GLIBC\n", pkg_cxx); fprintf(cfg, "default ADK_COMPILE_%s_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC\n\n", pkg_cxx); fprintf(cfg, "config ADK_COMPILE_%s_WITH_STDCXX\n", pkg_cxx); fprintf(cfg, "\tbool \"GNU C++ library\"\n"); |