71 CXXFLAGS="$EXTRA_CXXFLAGS"
72 LDFLAGS="$EXTRA_LDFLAGS"
73 CPPFLAGS=""
74 ])
75
76 # Setup the sysroot flags and add them to global CFLAGS and LDFLAGS so
77 # that configure can use them while detecting compilers.
78 # TOOLCHAIN_TYPE is available here.
79 # Param 1 - Optional prefix to all variables. (e.g BUILD_)
80 AC_DEFUN([FLAGS_SETUP_SYSROOT_FLAGS],
81 [
82 if test "x[$]$1SYSROOT" != "x"; then
83 if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
84 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
85 # Solaris Studio does not have a concept of sysroot. Instead we must
86 # make sure the default include and lib dirs are appended to each
87 # compile and link command line. Must also add -I-xbuiltin to enable
88 # inlining of system functions and intrinsics.
89 $1SYSROOT_CFLAGS="-I-xbuiltin -I[$]$1SYSROOT/usr/include"
90 $1SYSROOT_LDFLAGS="-L[$]$1SYSROOT/usr/lib$OPENJDK_TARGET_CPU_ISADIR \
91 -L[$]$1SYSROOT/lib$OPENJDK_TARGET_CPU_ISADIR \
92 -L[$]$1SYSROOT/usr/ccs/lib$OPENJDK_TARGET_CPU_ISADIR"
93 fi
94 elif test "x$TOOLCHAIN_TYPE" = xgcc; then
95 $1SYSROOT_CFLAGS="--sysroot=[$]$1SYSROOT"
96 $1SYSROOT_LDFLAGS="--sysroot=[$]$1SYSROOT"
97 elif test "x$TOOLCHAIN_TYPE" = xclang; then
98 $1SYSROOT_CFLAGS="-isysroot [$]$1SYSROOT"
99 $1SYSROOT_LDFLAGS="-isysroot [$]$1SYSROOT"
100 fi
101 # Propagate the sysroot args to hotspot
102 $1LEGACY_EXTRA_CFLAGS="[$]$1LEGACY_EXTRA_CFLAGS [$]$1SYSROOT_CFLAGS"
103 $1LEGACY_EXTRA_CXXFLAGS="[$]$1LEGACY_EXTRA_CXXFLAGS [$]$1SYSROOT_CFLAGS"
104 $1LEGACY_EXTRA_LDFLAGS="[$]$1LEGACY_EXTRA_LDFLAGS [$]$1SYSROOT_LDFLAGS"
105 # The global CFLAGS and LDFLAGS variables need these for configure to function
106 $1CFLAGS="[$]$1CFLAGS [$]$1SYSROOT_CFLAGS"
107 $1CPPFLAGS="[$]$1CPPFLAGS [$]$1SYSROOT_CFLAGS"
108 $1CXXFLAGS="[$]$1CXXFLAGS [$]$1SYSROOT_CFLAGS"
109 $1LDFLAGS="[$]$1LDFLAGS [$]$1SYSROOT_LDFLAGS"
110 fi
111
112 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
|
71 CXXFLAGS="$EXTRA_CXXFLAGS"
72 LDFLAGS="$EXTRA_LDFLAGS"
73 CPPFLAGS=""
74 ])
75
76 # Setup the sysroot flags and add them to global CFLAGS and LDFLAGS so
77 # that configure can use them while detecting compilers.
78 # TOOLCHAIN_TYPE is available here.
79 # Param 1 - Optional prefix to all variables. (e.g BUILD_)
80 AC_DEFUN([FLAGS_SETUP_SYSROOT_FLAGS],
81 [
82 if test "x[$]$1SYSROOT" != "x"; then
83 if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
84 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
85 # Solaris Studio does not have a concept of sysroot. Instead we must
86 # make sure the default include and lib dirs are appended to each
87 # compile and link command line. Must also add -I-xbuiltin to enable
88 # inlining of system functions and intrinsics.
89 $1SYSROOT_CFLAGS="-I-xbuiltin -I[$]$1SYSROOT/usr/include"
90 $1SYSROOT_LDFLAGS="-L[$]$1SYSROOT/usr/lib$OPENJDK_TARGET_CPU_ISADIR \
91 -L[$]$1SYSROOT/lib$OPENJDK_TARGET_CPU_ISADIR"
92 fi
93 elif test "x$TOOLCHAIN_TYPE" = xgcc; then
94 $1SYSROOT_CFLAGS="--sysroot=[$]$1SYSROOT"
95 $1SYSROOT_LDFLAGS="--sysroot=[$]$1SYSROOT"
96 elif test "x$TOOLCHAIN_TYPE" = xclang; then
97 $1SYSROOT_CFLAGS="-isysroot [$]$1SYSROOT"
98 $1SYSROOT_LDFLAGS="-isysroot [$]$1SYSROOT"
99 fi
100 # Propagate the sysroot args to hotspot
101 $1LEGACY_EXTRA_CFLAGS="[$]$1LEGACY_EXTRA_CFLAGS [$]$1SYSROOT_CFLAGS"
102 $1LEGACY_EXTRA_CXXFLAGS="[$]$1LEGACY_EXTRA_CXXFLAGS [$]$1SYSROOT_CFLAGS"
103 $1LEGACY_EXTRA_LDFLAGS="[$]$1LEGACY_EXTRA_LDFLAGS [$]$1SYSROOT_LDFLAGS"
104 # The global CFLAGS and LDFLAGS variables need these for configure to function
105 $1CFLAGS="[$]$1CFLAGS [$]$1SYSROOT_CFLAGS"
106 $1CPPFLAGS="[$]$1CPPFLAGS [$]$1SYSROOT_CFLAGS"
107 $1CXXFLAGS="[$]$1CXXFLAGS [$]$1SYSROOT_CFLAGS"
108 $1LDFLAGS="[$]$1LDFLAGS [$]$1SYSROOT_LDFLAGS"
109 fi
110
111 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
|