equal
deleted
inserted
replaced
666 LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)" |
666 LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)" |
667 fi |
667 fi |
668 |
668 |
669 # Setup some hard coded includes |
669 # Setup some hard coded includes |
670 COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \ |
670 COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \ |
671 -I${JDK_OUTPUTDIR}/include \ |
671 -I${JDK_TOPDIR}/src/java.base/share/native/include \ |
672 -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \ |
672 -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS/native/include \ |
673 -I${JDK_TOPDIR}/src/share/javavm/export \ |
673 -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_API_DIR/native/include" |
674 -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \ |
|
675 -I${JDK_TOPDIR}/src/share/native/common \ |
|
676 -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common" |
|
677 |
674 |
678 # The shared libraries are compiled using the picflag. |
675 # The shared libraries are compiled using the picflag. |
679 CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA" |
676 CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA" |
680 CXXFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA " |
677 CXXFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA " |
681 |
678 |