make/autoconf/compare.sh.in
changeset 53110 50677f43ac3d
parent 47253 92fd0e04e0e1
child 53570 ab7fcc43dab4
equal deleted inserted replaced
53109:b99b41325d89 53110:50677f43ac3d
    29 ##########################################################################################
    29 ##########################################################################################
    30 # Substitutions from autoconf
    30 # Substitutions from autoconf
    31 
    31 
    32 export LEGACY_BUILD_DIR=@OPENJDK_TARGET_OS@-@OPENJDK_TARGET_CPU_LEGACY@
    32 export LEGACY_BUILD_DIR=@OPENJDK_TARGET_OS@-@OPENJDK_TARGET_CPU_LEGACY@
    33 
    33 
       
    34 export OPENJDK_BUILD_OS_ENV="@OPENJDK_BUILD_OS_ENV@"
    34 export OPENJDK_TARGET_OS="@OPENJDK_TARGET_OS@"
    35 export OPENJDK_TARGET_OS="@OPENJDK_TARGET_OS@"
    35 export OPENJDK_TARGET_CPU="@OPENJDK_TARGET_CPU@"
    36 export OPENJDK_TARGET_CPU="@OPENJDK_TARGET_CPU@"
    36 export DEBUG_LEVEL="@DEBUG_LEVEL@"
    37 export DEBUG_LEVEL="@DEBUG_LEVEL@"
    37 
    38 
    38 export AWK="@AWK@"
    39 export AWK="@AWK@"
    71 
    72 
    72 export TOPDIR="@TOPDIR@"
    73 export TOPDIR="@TOPDIR@"
    73 export OUTPUTDIR="@OUTPUTDIR@"
    74 export OUTPUTDIR="@OUTPUTDIR@"
    74 
    75 
    75 if [ "@COMPILE_TYPE@" != "cross" ]; then
    76 if [ "@COMPILE_TYPE@" != "cross" ]; then
    76     export JAVAP="@FIXPATH@ $OUTPUTDIR/jdk/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
    77   export JAVAP="@FIXPATH@ $OUTPUTDIR/jdk/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
    77     export JIMAGE="@FIXPATH@ $OUTPUTDIR/jdk/bin/jimage"
    78   export JIMAGE="@FIXPATH@ $OUTPUTDIR/jdk/bin/jimage"
    78 elif [ "@CREATE_BUILDJDK@" = "true" ]; then
    79 elif [ "@CREATE_BUILDJDK@" = "true" ]; then
    79     export JAVAP="@FIXPATH@ $OUTPUTDIR/buildjdk/jdk/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
    80   export JAVAP="@FIXPATH@ $OUTPUTDIR/buildjdk/jdk/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
    80     export JIMAGE="@FIXPATH@ $OUTPUTDIR/buildjdk/jdk/bin/jimage"
    81   export JIMAGE="@FIXPATH@ $OUTPUTDIR/buildjdk/jdk/bin/jimage"
    81 else
    82 else
    82     export JAVAP="@FIXPATH@ @BUILD_JDK@/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
    83   export JAVAP="@FIXPATH@ @BUILD_JDK@/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
    83     export JIMAGE="@FIXPATH@ @BUILD_JDK@/bin/jimage"
    84   export JIMAGE="@FIXPATH@ @BUILD_JDK@/bin/jimage"
    84 fi
    85 fi
    85 
    86 
    86 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
    87 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
    87   export PATH="@VS_PATH@"
    88   if [ "$OPENJDK_BUILD_OS_ENV" = "windows.wsl" ]; then
       
    89     export FIXPATH_PATH="@VS_PATH_WINDOWS@"
       
    90     export WSLENV="$WSLENV:FIXPATH_PATH:DEBUG_FIXPATH"
       
    91   else
       
    92     export PATH="@VS_PATH@"
       
    93   fi
    88 fi
    94 fi
    89 
    95 
    90 # Now locate the main script and run it.
    96 # Now locate the main script and run it.
    91 REAL_COMPARE_SCRIPT="$TOPDIR/make/scripts/compare.sh"
    97 REAL_COMPARE_SCRIPT="$TOPDIR/make/scripts/compare.sh"
    92 if [ ! -e "$REAL_COMPARE_SCRIPT" ]; then
    98 if [ ! -e "$REAL_COMPARE_SCRIPT" ]; then