70 ]) |
70 ]) |
71 |
71 |
72 # Setup the sysroot flags and add them to global CFLAGS and LDFLAGS so |
72 # Setup the sysroot flags and add them to global CFLAGS and LDFLAGS so |
73 # that configure can use them while detecting compilers. |
73 # that configure can use them while detecting compilers. |
74 # TOOLCHAIN_TYPE is available here. |
74 # TOOLCHAIN_TYPE is available here. |
75 AC_DEFUN_ONCE([FLAGS_SETUP_SYSROOT_FLAGS], |
75 # Param 1 - Optional prefix to all variables. (e.g BUILD_) |
|
76 AC_DEFUN([FLAGS_SETUP_SYSROOT_FLAGS], |
76 [ |
77 [ |
77 if test "x$SYSROOT" != "x"; then |
78 if test "x[$]$1SYSROOT" != "x"; then |
78 if test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
79 if test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
79 if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
80 if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
80 # Solaris Studio does not have a concept of sysroot. Instead we must |
81 # Solaris Studio does not have a concept of sysroot. Instead we must |
81 # make sure the default include and lib dirs are appended to each |
82 # make sure the default include and lib dirs are appended to each |
82 # compile and link command line. |
83 # compile and link command line. |
83 SYSROOT_CFLAGS="-I$SYSROOT/usr/include" |
84 $1SYSROOT_CFLAGS="-I[$]$1SYSROOT/usr/include" |
84 SYSROOT_LDFLAGS="-L$SYSROOT/usr/lib$OPENJDK_TARGET_CPU_ISADIR \ |
85 $1SYSROOT_LDFLAGS="-L[$]$1SYSROOT/usr/lib$OPENJDK_TARGET_CPU_ISADIR \ |
85 -L$SYSROOT/lib$OPENJDK_TARGET_CPU_ISADIR \ |
86 -L[$]$1SYSROOT/lib$OPENJDK_TARGET_CPU_ISADIR \ |
86 -L$SYSROOT/usr/ccs/lib$OPENJDK_TARGET_CPU_ISADIR" |
87 -L[$]$1SYSROOT/usr/ccs/lib$OPENJDK_TARGET_CPU_ISADIR" |
87 fi |
88 fi |
88 elif test "x$TOOLCHAIN_TYPE" = xgcc; then |
89 elif test "x$TOOLCHAIN_TYPE" = xgcc; then |
89 SYSROOT_CFLAGS="--sysroot=$SYSROOT" |
90 $1SYSROOT_CFLAGS="--sysroot=[$]$1SYSROOT" |
90 SYSROOT_LDFLAGS="--sysroot=$SYSROOT" |
91 $1SYSROOT_LDFLAGS="--sysroot=[$]$1SYSROOT" |
91 elif test "x$TOOLCHAIN_TYPE" = xclang; then |
92 elif test "x$TOOLCHAIN_TYPE" = xclang; then |
92 SYSROOT_CFLAGS="-isysroot $SYSROOT" |
93 $1SYSROOT_CFLAGS="-isysroot [$]$1SYSROOT" |
93 SYSROOT_LDFLAGS="-isysroot $SYSROOT" |
94 $1SYSROOT_LDFLAGS="-isysroot [$]$1SYSROOT" |
94 fi |
95 fi |
95 # Propagate the sysroot args to hotspot |
96 # Propagate the sysroot args to hotspot |
96 LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $SYSROOT_CFLAGS" |
97 $1LEGACY_EXTRA_CFLAGS="[$]$1LEGACY_EXTRA_CFLAGS [$]$1SYSROOT_CFLAGS" |
97 LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $SYSROOT_CFLAGS" |
98 $1LEGACY_EXTRA_CXXFLAGS="[$]$1LEGACY_EXTRA_CXXFLAGS [$]$1SYSROOT_CFLAGS" |
98 LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $SYSROOT_LDFLAGS" |
99 $1LEGACY_EXTRA_LDFLAGS="[$]$1LEGACY_EXTRA_LDFLAGS [$]$1SYSROOT_LDFLAGS" |
99 # The global CFLAGS and LDFLAGS variables need these for configure to function |
100 # The global CFLAGS and LDFLAGS variables need these for configure to function |
100 CFLAGS="$CFLAGS $SYSROOT_CFLAGS" |
101 $1CFLAGS="[$]$1CFLAGS [$]$1SYSROOT_CFLAGS" |
101 CPPFLAGS="$CPPFLAGS $SYSROOT_CFLAGS" |
102 $1CPPFLAGS="[$]$1CPPFLAGS [$]$1SYSROOT_CFLAGS" |
102 CXXFLAGS="$CXXFLAGS $SYSROOT_CFLAGS" |
103 $1CXXFLAGS="[$]$1CXXFLAGS [$]$1SYSROOT_CFLAGS" |
103 LDFLAGS="$LDFLAGS $SYSROOT_LDFLAGS" |
104 $1LDFLAGS="[$]$1LDFLAGS [$]$1SYSROOT_LDFLAGS" |
104 fi |
105 fi |
105 |
106 |
106 if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
107 if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
107 # We also need -iframework<path>/System/Library/Frameworks |
108 # We also need -iframework<path>/System/Library/Frameworks |
108 SYSROOT_CFLAGS="$SYSROOT_CFLAGS -iframework $SYSROOT/System/Library/Frameworks" |
109 $1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS -iframework [$]$1SYSROOT/System/Library/Frameworks" |
109 SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS -iframework $SYSROOT/System/Library/Frameworks" |
110 $1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -iframework [$]$1SYSROOT/System/Library/Frameworks" |
110 # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework |
111 # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework |
111 # set this here so it doesn't have to be peppered throughout the forest |
112 # set this here so it doesn't have to be peppered throughout the forest |
112 SYSROOT_CFLAGS="$SYSROOT_CFLAGS -F $SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks" |
113 $1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks" |
113 SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS -F $SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks" |
114 $1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks" |
114 fi |
115 fi |
115 |
116 |
116 AC_SUBST(SYSROOT_CFLAGS) |
117 AC_SUBST($1SYSROOT_CFLAGS) |
117 AC_SUBST(SYSROOT_LDFLAGS) |
118 AC_SUBST($1SYSROOT_LDFLAGS) |
118 ]) |
119 ]) |
119 |
120 |
120 AC_DEFUN_ONCE([FLAGS_SETUP_INIT_FLAGS], |
121 AC_DEFUN_ONCE([FLAGS_SETUP_INIT_FLAGS], |
121 [ |
122 [ |
122 # Option used to tell the compiler whether to create 32- or 64-bit executables |
123 # Option used to tell the compiler whether to create 32- or 64-bit executables |