a1batross/kore
1
0
Fork 0
forked from mirrors/kore
Code Issues Pull Requests Projects Releases Wiki Activity

Explicitly link libstdc++.

Browse Source
This commit is contained in:
Geenz 2015-04-01 08:32:24 -04:00
parent 86daf3f1b0
commit 97ec644a9a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -23,7 +23,8 @@ ifneq ("$(DEBUG)", "")
endif
ifneq ("$(KORE_CPP_SUPPORT)", "")
CFLAGS+=-DKORE_CPP_SUPPORT
CFLAGS+=-DKORE_CPP_SUPPORT
LDFLAGS+=-lstdc++
endif
ifneq ("$(KORE_PEDANTIC_MALLOC)", "")

7
src/cli.c
View File

@ -990,7 +990,7 @@ cli_compile_cppfile(void *arg)
{
int idx;
struct cfile *cf = arg;
char *args[25], *ipath[2];
char *args[24], *ipath[2];
#if defined(KORE_USE_PGSQL)
char *ppath;
#endif
@ -1032,7 +1032,6 @@ cli_compile_cppfile(void *arg)
args[idx++] = "-Wold-style-cast";
args[idx++] = "-Wnon-virtual-dtor";
args[idx++] = "-std=c++11";
args[idx++] = "-std=gnu++11";
args[idx++] = "-c";
args[idx++] = cf->fpath;
@ -1050,7 +1049,7 @@ cli_link_library(void *arg)
struct cfile *cf;
int idx, f, i;
char *p, *libname, *flags[LD_FLAGS_MAX];
char *args[cfiles_count + 10 + LD_FLAGS_MAX];
char *args[cfiles_count + 11 + LD_FLAGS_MAX];
if ((p = getenv("LDFLAGS")) != NULL)
f = kore_split_string(p, " ", flags, LD_FLAGS_MAX);
@ -1077,6 +1076,8 @@ cli_link_library(void *arg)
#if defined(KORE_CPP_SUPPORT)
TAILQ_FOREACH(cf, &cpp_files, list)
args[idx++] = cf->opath;
args[idx++] = "-lstdc++";
#endif
for (i = 0; i < f; i++)