@@ -37,7 +37,7 @@
ACLOCAL_AMFLAGS = -I ./config -I ../config
AM_CFLAGS = -fexceptions -fplan9-extensions $(SPLIT_STACK) $(WARN_CFLAGS) \
- $(STRINGOPS_FLAG) \
+ $(STRINGOPS_FLAG) $(OSCFLAGS) \
-I $(srcdir)/../libgcc -I $(MULTIBUILDTOP)../../gcc/include
if USING_SPLIT_STACK
@@ -277,23 +277,24 @@
AC_SUBST(GO_SYSCALL_OS_FILE)
AC_SUBST(GO_SYSCALL_OS_ARCH_FILE)
-dnl Some targets need special flags to build sysinfo.go.
+dnl Special flags used to generate sysinfo.go.
+OSCFLAGS="-D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
case "$target" in
mips-sgi-irix6.5*)
# IRIX 6 needs _XOPEN_SOURCE=500 for the XPG5 version of struct
# msghdr in <sys/socket.h>.
- OSCFLAGS='-D_XOPEN_SOURCE=500'
+ OSCFLAGS="$OSCFLAGS -D_XOPEN_SOURCE=500"
;;
*-*-solaris2.[[89]])
# Solaris 8/9 need this so struct msghdr gets the msg_control
# etc. fields in <sys/socket.h> (_XPG4_2).
- OSCFLAGS='-D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D__EXTENSIONS__'
+ OSCFLAGS="$OSCFLAGS -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D__EXTENSIONS__"
;;
*-*-solaris2.1[[01]])
# Solaris 10+ needs this so struct msghdr gets the msg_control
# etc. fields in <sys/socket.h> (_XPG4_2). _XOPEN_SOURCE=500 as
# above doesn't work with C99.
- OSCFLAGS='-D_XOPEN_SOURCE=600 -D__EXTENSIONS__'
+ OSCFLAGS="$OSCFLAGS -D_XOPEN_SOURCE=600 -D__EXTENSIONS__"
;;
esac
AC_SUBST(OSCFLAGS)
@@ -7,9 +7,6 @@
We use C code to extract the wait status so that we can easily be
OS-independent. */
-#define _GNU_SOURCE
-#define __EXTENSIONS__
-
#include <stdint.h>
#include <sys/wait.h>
@@ -25,10 +25,6 @@
cat > sysinfo.c <<EOF
#include "config.h"
-#define _GNU_SOURCE
-#define _LARGEFILE_SOURCE
-#define _FILE_OFFSET_BITS 64
-
#include <sys/types.h>
#include <dirent.h>
#include <errno.h>