z/OS support: Make env

Changing CFLAGS

Makefile.conf

@@ -97,7 +97,7 @@ endif
 
 ifeq ($(BUILD_FOR),OS/390)
     CFLAGS= -Wno-gnu-include-next -qnosearch -I$(HERE) -I.
-    CFLAGS+= -I/usr/lpp/java/J8.0_64/include -I/usr/include
+    CFLAGS+= -I/usr/include
     CFLAGS+= -DZOS -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112L -qlanglvl=NOLIBEXT
 else ifeq ($(BUILD_FOR),Linux)
     CFLAGS+=-fPIC -fstrict-aliasing -fdiagnostics-color=auto
@@ -166,7 +166,9 @@ else ifeq ($(BUILD_FOR),OS/390)
     CXX=xlclang++ -std=c++11
 endif
 
+ifneq ($(BUILD_FOR),OS/390)
 CXXFLAGS+=-pthread
+endif
 
 # The flag -DNDEBUG will always be removed from CPPFLAGS for compiling tests.
 #
@@ -362,7 +364,9 @@ ifndef PEP_MIME_SRC
     $(error "Compiling with the PEP_MIME option set requires the value of PEP_MIME_SRC to be set to the source directory for libpEpMIME")
 else
     CPPFLAGS+=-DPEP_BUILTIN_MIME
+ifneq ($(BUILD_ON),OS/390)
     LDLIBS+=-lstdc++
+endif
     ETPAN_LIB=
     ETPAN_INC=
 endif