From: Aleksey Kliger (λgeek) Date: Mon, 30 Dec 2019 14:54:57 +0000 (-0500) Subject: [eglib] Don't define _FORTIFY_SOURCE on Cygwin builds (mono/mono#18308) X-Git-Tag: submit/tizen/20210909.063632~10331^2~5^2~61 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=846e089ea96d90f660f1b3aeece8d0804bd47651;p=platform%2Fupstream%2Fdotnet%2Fruntime.git [eglib] Don't define _FORTIFY_SOURCE on Cygwin builds (mono/mono#18308) See https://github.com/msys2/MINGW-packages/issues/5803 Without -lssp (or -fstack-protector), -D_FORTIFY_SOURCE=2 leads to linker errors. Commit migrated from https://github.com/mono/mono/commit/61eb2be2e10c228c5915d90a90b52e7d410c0f25 --- diff --git a/src/mono/mono/eglib/Makefile.am b/src/mono/mono/eglib/Makefile.am index d80012c..dfdcd0e 100644 --- a/src/mono/mono/eglib/Makefile.am +++ b/src/mono/mono/eglib/Makefile.am @@ -63,7 +63,11 @@ if !ENABLE_MSVC_ONLY eglibdir=$(datadir)/mono-$(API_VER)/mono/eglib eglib_DATA = eglib-config.h -libeglib_la_CFLAGS = -g -Wall -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE +libeglib_la_CFLAGS = -g -Wall -D_GNU_SOURCE + +if !HOST_WIN32 +libeglib_la_CFLAGS += -D_FORTIFY_SOURCE=2 +endif AM_CPPFLAGS = -I$(srcdir) diff --git a/src/mono/mono/eglib/test/Makefile.am b/src/mono/mono/eglib/test/Makefile.am index 6d3330a..b7dda5f 100644 --- a/src/mono/mono/eglib/test/Makefile.am +++ b/src/mono/mono/eglib/test/Makefile.am @@ -34,7 +34,10 @@ SOURCES = \ test_eglib_SOURCES = $(SOURCES) -GLIB_TEST_FLAGS_COMMON = -Wall -DEGLIB_TESTS=1 -D_FORTIFY_SOURCE=2 -I$(srcdir)/.. -I.. -DDRIVER_NAME=\"EGlib\" +GLIB_TEST_FLAGS_COMMON = -Wall -DEGLIB_TESTS=1 -I$(srcdir)/.. -I.. -DDRIVER_NAME=\"EGlib\" +if !HOST_WIN32 +GLIB_TEST_FLAGS_COMMON += -D_FORTIFY_SOURCE=2 +endif CFLAGS += $(GLIB_TEST_FLAGS_COMMON) CXXFLAGS += $(GLIB_TEST_FLAGS_COMMON) @CXXFLAGS_COMMON@ if HOST_AIX