Changeset 51156 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Apr 28, 2014 4:09:33 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

93486

Message:

Convince Solaris headers to expose socket stuff we need in a way that
works for newer versions of g++ too. See the comment for gory details.

File:

• trunk/src/VBox/NetworkServices/NAT/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/NetworkServices/NAT/Makefile.kmk

@@ -57 +57 @@
 VBoxNetLwipNAT_LDFLAGS.win = /SUBSYSTEM:windows
 
-# Convince Solaris headers to expose socket stuff we need.  600 would
-# also work, but <sys/feature_tests.h> insists on C99 for it and so
-# explodes for C++.  Note that for 500 it insists on NOT using C99, so
-# when some day we decide to use -std=c99 we are in for some fun.
-VBoxNetLwipNAT_DEFS.solaris += _XOPEN_SOURCE=500 __EXTENSIONS__=1
+# Convince Solaris headers to expose socket stuff we need.
+#
+# Setting _XOPEN_SOURCE to either 500 or 600 would always work, but
+# <sys/feature_tests.h> insists that 600 requires C99 and so it
+# explodes for older g++.  It also insists that 500 is NOT to be used
+# with C99.
+#
+# Newer g++ in C++11 mode (formerly known as C++0x) needs 600, so it
+# employs sleight of hand to pretend it's C99 to keep feature test
+# happy.
+#
+# Compile the C code with settings that match g++.  This probably
+# should be centralized so that whole codebase uses consistent
+# settings.
+ifeq ($(KBUILD_TARGET),solaris)
+ ifneq ($(VBOX_GCC_VERSION_CXX),)
+  ifneq ($(int-ge $(VBOX_GCC_VERSION_CXX),40600),)
+   # we compile C++ code with -std=c++0x / -std=c++11
+   VBoxNetLwipNAT_CFLAGS.solaris += -std=c99
+   VBoxNetLwipNAT_DEFS.solaris += _XOPEN_SOURCE=600
+  else
+   VBoxNetLwipNAT_DEFS.solaris += _XOPEN_SOURCE=500
+  endif
+ endif
+ VBoxNetLwipNAT_DEFS.solaris += __EXTENSIONS__=1
+endif
 
 VBoxNetLwipNAT_SOURCES += \