Skip to content

Commit

Permalink
Define PLATFORM_GNU which covers any OS with GNU userland.
Browse files Browse the repository at this point in the history
This define covers kFreeBSD, not just Linux. This is required because
the error which 120d194 works around is
a GNU problem, not a Linux problem, so causes FTBFS on kFreeBSD.
  • Loading branch information
directhex committed Jul 31, 2014
1 parent 0fe5be9 commit 056cc3b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions configure.ac
Expand Up @@ -368,6 +368,7 @@ fi
AC_SUBST(extra_runtime_ldflags)
AM_CONDITIONAL(HOST_WIN32, test x$host_win32 = xyes)
AM_CONDITIONAL(TARGET_WIN32, test x$target_win32 = xyes)
AM_CONDITIONAL(PLATFORM_GNU, echo x$target_os | grep -q -- -gnu$)

This comment has been minimized.

Copy link
@woodsb02

woodsb02 Sep 28, 2014

This problem also exists on FreeBSD, but is not resolved by this check.
Instead of testing target_os... need to test if the linker being used is GNU ld.

AM_CONDITIONAL(PLATFORM_LINUX, echo x$target_os | grep -q linux)
AM_CONDITIONAL(PLATFORM_DARWIN, test x$platform_darwin = xyes)
AM_CONDITIONAL(PLATFORM_SIGPOSIX, test x$use_sigposix = xyes)
Expand Down
4 changes: 2 additions & 2 deletions mono/unit-tests/Makefile.am
Expand Up @@ -11,7 +11,7 @@ endif
if !CROSS_COMPILE
if !HOST_WIN32
if SUPPORT_BOEHM
if !PLATFORM_LINUX
if !PLATFORM_GNU

test_sgen_qsort_SOURCES = test-sgen-qsort.c
test_sgen_qsort_CFLAGS = $(TEST_CFLAGS)
Expand All @@ -37,7 +37,7 @@ noinst_PROGRAMS = test-sgen-qsort test-gc-memfuncs test-mono-linked-list-set tes

TESTS = test-sgen-qsort test-gc-memfuncs test-mono-linked-list-set test-conc-hashtable

endif !PLATFORM_LINUX
endif !PLATFORM_GNU
endif SUPPORT_BOEHM
endif !HOST_WIN32
endif !CROSS_COMPILE
Expand Down

0 comments on commit 056cc3b

Please sign in to comment.