diff options
| author | grischka <grischka> | 2011-08-11 16:55:30 +0200 |
|---|---|---|
| committer | grischka <grischka> | 2011-08-11 16:55:30 +0200 |
| commit | 74a24d77fd9c08ad9a6b3b6c0f434c7314dae639 (patch) | |
| tree | 4cae2ee70148c10aeedf322a24ac06a626a6249d /tccelf.c | |
| parent | fd0cea8895c3d253644fee51f50da9ff94fe83a3 (diff) | |
| download | tinycc-74a24d77fd9c08ad9a6b3b6c0f434c7314dae639.tar.gz tinycc-74a24d77fd9c08ad9a6b3b6c0f434c7314dae639.tar.bz2 | |
libtcc: minor adjustments
- use {B} to substitute tcc_lih_path (instead of \b)
- expand CONFIG_TCC_CRTPREFIX in CONFIG_TCC_LIBPATHS
which fixes duplicate CONFIG_SYSROOT.
- put default CONFIG_SYSROOT ("") into tcc.h
- remove hack from commit db6fcce78f4d8ea25036dd6643e9fa83d8e52e5a
because $(tccdir)/include is already in sysincludes
- configure: error out for unrecognized options.
- win32/build-tcc.bat: put libtcc into base dir where it will
find lib/include automatically, and build libtcc_test example.
Diffstat (limited to 'tccelf.c')
| -rw-r--r-- | tccelf.c | 14 |
1 files changed, 1 insertions, 13 deletions
@@ -2856,19 +2856,11 @@ static int filename_to_libname(TCCState *s1, const char filename[], char libname return 0; libprefix = !strncmp(filename, "lib", 3); if (!s1->static_link) { -#ifdef TCC_TARGET_PE - if (!strcmp(ext, ".def")) { - size_t len = ext - filename; - pstrncpy(libname, filename, len); - return 1; - } -#else if (libprefix && (!strcmp(ext, ".so"))) { size_t len = ext - filename - 3; pstrncpy(libname, filename + 3, len); return 1; } -#endif } else { if (libprefix && (!strcmp(ext, ".a"))) { size_t len = ext - filename - 3; @@ -2887,11 +2879,7 @@ static int filename_to_libname(TCCState *s1, const char filename[], char libname static void libname_to_filename(TCCState *s1, const char libname[], char filename[]) { if (!s1->static_link) { -#ifdef TCC_TARGET_PE - sprintf(filename, "%s.def", libname); -#else sprintf(filename, "lib%s.so", libname); -#endif } else { sprintf(filename, "lib%s.a", libname); } @@ -3029,4 +3017,4 @@ ST_FUNC int tcc_load_ldscript(TCCState *s1) } return 0; } -#endif +#endif /* ndef TCC_TARGET_PE */ |
