Mercurial > jdk8-mips64-public / file comparison
comparison: common/autoconf/toolchain.m4
common/autoconf/toolchain.m4
- changeset 2224
- 20daa32eec6f
- parent 2223
- 01cc48ed67f3
- child 2227
- 77b81e582939
equal
deleted
inserted
replaced
| 2223:01cc48ed67f3 | 2224:20daa32eec6f |
|---|---|
| 215 # Store the CFLAGS etal passed to the configure script. | 215 # Store the CFLAGS etal passed to the configure script. |
| 216 ORG_CFLAGS="$CFLAGS" | 216 ORG_CFLAGS="$CFLAGS" |
| 217 ORG_CXXFLAGS="$CXXFLAGS" | 217 ORG_CXXFLAGS="$CXXFLAGS" |
| 218 ORG_OBJCFLAGS="$OBJCFLAGS" | 218 ORG_OBJCFLAGS="$OBJCFLAGS" |
| 219 | 219 |
| 220 # autoconf magic only relies on PATH, so update it if tools dir is specified | |
| 221 OLD_PATH="$PATH" | |
| 222 | |
| 220 # On Windows, we need to detect the visual studio installation first. | 223 # On Windows, we need to detect the visual studio installation first. |
| 221 # This will change the PATH, but we need to keep that new PATH even | 224 # This will change the PATH, but we need to keep that new PATH even |
| 222 # after toolchain detection is done, since the compiler (on x86) uses | 225 # after toolchain detection is done, since the compiler (on x86) uses |
| 223 # it for DLL resolution in runtime. | 226 # it for DLL resolution in runtime. |
| 224 if test "x$OPENJDK_BUILD_OS" = "xwindows" && test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then | 227 if test "x$OPENJDK_BUILD_OS" = "xwindows" \ |
| 228 && test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then | |
| 225 TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV | 229 TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV |
| 226 # Reset path to VS_PATH. It will include everything that was on PATH at the time we | 230 # Reset path to VS_PATH. It will include everything that was on PATH at the time we |
| 227 # ran TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV. | 231 # ran TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV. |
| 228 PATH="$VS_PATH" | 232 PATH="$VS_PATH" |
| 229 # The microsoft toolchain also requires INCLUDE and LIB to be set. | 233 # The microsoft toolchain also requires INCLUDE and LIB to be set. |
| 230 export INCLUDE="$VS_INCLUDE" | 234 export INCLUDE="$VS_INCLUDE" |
| 231 export LIB="$VS_LIB" | 235 export LIB="$VS_LIB" |
| 232 fi | 236 fi |
| 233 | |
| 234 # autoconf magic only relies on PATH, so update it if tools dir is specified | |
| 235 OLD_PATH="$PATH" | |
| 236 | 237 |
| 237 # Before we locate the compilers, we need to sanitize the Xcode build environment | 238 # Before we locate the compilers, we need to sanitize the Xcode build environment |
| 238 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then | 239 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then |
| 239 # determine path to Xcode developer directory | 240 # determine path to Xcode developer directory |
| 240 # can be empty in which case all the tools will rely on a sane Xcode 4 installation | 241 # can be empty in which case all the tools will rely on a sane Xcode 4 installation |
