make/autoconf/flags.m4

*** 1164,1174 ****
        -I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
        -I${TOPDIR}/src/java.base/share/native/include \
        -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS/native/include \
        -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/include \
        -I${TOPDIR}/src/java.base/share/native/libjava \
!       -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/libjava"
  
    # The shared libraries are compiled using the picflag.
    $2CFLAGS_JDKLIB="[$]$2COMMON_CCXXFLAGS_JDK \
        [$]$2CFLAGS_JDK [$]$2EXTRA_CFLAGS_JDK $PICFLAG [$]$2CFLAGS_JDKLIB_EXTRA"
    $2CXXFLAGS_JDKLIB="[$]$2COMMON_CCXXFLAGS_JDK \
--- 1164,1176 ----
        -I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
        -I${TOPDIR}/src/java.base/share/native/include \
        -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS/native/include \
        -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/include \
        -I${TOPDIR}/src/java.base/share/native/libjava \
!       -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/libjava \
!       -I${TOPDIR}/src/hotspot/share/include \
!       -I${TOPDIR}/src/hotspot/os/${HOTSPOT_$1_OS_TYPE}/include"
  
    # The shared libraries are compiled using the picflag.
    $2CFLAGS_JDKLIB="[$]$2COMMON_CCXXFLAGS_JDK \
        [$]$2CFLAGS_JDK [$]$2EXTRA_CFLAGS_JDK $PICFLAG [$]$2CFLAGS_JDKLIB_EXTRA"
    $2CXXFLAGS_JDKLIB="[$]$2COMMON_CCXXFLAGS_JDK \