Mercurial > jdk8-mips64-public / file comparison
comparison: common/autoconf/toolchain.m4
common/autoconf/toolchain.m4
- changeset 2207
- ddf2d8bf87c0
- parent 2206
- 7ba4e17574e0
- child 2208
- feba63b3fa36
equal
deleted
inserted
replaced
| 2206:7ba4e17574e0 | 2207:ddf2d8bf87c0 |
|---|---|
| 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 # 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 | |
| 222 # after toolchain detection is done, since the compiler (on x86) uses | |
| 223 # it for DLL resolution in runtime. | |
| 224 if test "x$OPENJDK_BUILD_OS" = "xwindows" && test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then | |
| 225 TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV | |
| 226 fi | |
| 227 | |
| 220 # autoconf magic only relies on PATH, so update it if tools dir is specified | 228 # autoconf magic only relies on PATH, so update it if tools dir is specified |
| 221 OLD_PATH="$PATH" | 229 OLD_PATH="$PATH" |
| 222 | 230 |
| 223 # Before we locate the compilers, we need to sanitize the Xcode build environment | 231 # Before we locate the compilers, we need to sanitize the Xcode build environment |
| 224 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then | 232 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then |
| 305 # The build tools on Solaris reside in /usr/ccs (C Compilation System), | 313 # The build tools on Solaris reside in /usr/ccs (C Compilation System), |
| 306 # so add that to path before starting to probe. | 314 # so add that to path before starting to probe. |
| 307 # FIXME: This was originally only done for AS,NM,GNM,STRIP,MCS,OBJCOPY,OBJDUMP. | 315 # FIXME: This was originally only done for AS,NM,GNM,STRIP,MCS,OBJCOPY,OBJDUMP. |
| 308 if test "x$OPENJDK_BUILD_OS" = xsolaris; then | 316 if test "x$OPENJDK_BUILD_OS" = xsolaris; then |
| 309 PATH="/usr/ccs/bin:$PATH" | 317 PATH="/usr/ccs/bin:$PATH" |
| 310 fi | |
| 311 | |
| 312 # On Windows, we need to detect the visual studio installation first. | |
| 313 if test "x$OPENJDK_BUILD_OS" = "xwindows" && test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then | |
| 314 TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV | |
| 315 fi | 318 fi |
| 316 | 319 |
| 317 # Finally add TOOLS_DIR at the beginning, to allow --with-tools-dir to | 320 # Finally add TOOLS_DIR at the beginning, to allow --with-tools-dir to |
| 318 # override all other locations. | 321 # override all other locations. |
| 319 if test "x$TOOLS_DIR" != x; then | 322 if test "x$TOOLS_DIR" != x; then |
