equal
deleted
inserted
replaced
145 |
145 |
146 EXTRA_CFLAGS="$with_extra_cflags" |
146 EXTRA_CFLAGS="$with_extra_cflags" |
147 EXTRA_CXXFLAGS="$with_extra_cxxflags" |
147 EXTRA_CXXFLAGS="$with_extra_cxxflags" |
148 EXTRA_LDFLAGS="$with_extra_ldflags" |
148 EXTRA_LDFLAGS="$with_extra_ldflags" |
149 |
149 |
150 # Hotspot needs these set in their legacy form |
|
151 LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $EXTRA_CFLAGS" |
|
152 LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $EXTRA_CXXFLAGS" |
|
153 LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $EXTRA_LDFLAGS" |
|
154 |
|
155 AC_SUBST(LEGACY_EXTRA_CFLAGS) |
|
156 AC_SUBST(LEGACY_EXTRA_CXXFLAGS) |
|
157 AC_SUBST(LEGACY_EXTRA_LDFLAGS) |
|
158 |
|
159 AC_SUBST(EXTRA_CFLAGS) |
150 AC_SUBST(EXTRA_CFLAGS) |
160 AC_SUBST(EXTRA_CXXFLAGS) |
151 AC_SUBST(EXTRA_CXXFLAGS) |
161 AC_SUBST(EXTRA_LDFLAGS) |
152 AC_SUBST(EXTRA_LDFLAGS) |
162 |
153 |
163 # The global CFLAGS and LDLAGS variables are used by configure tests and |
154 # The global CFLAGS and LDLAGS variables are used by configure tests and |
190 $1SYSROOT_LDFLAGS="--sysroot=[$]$1SYSROOT" |
181 $1SYSROOT_LDFLAGS="--sysroot=[$]$1SYSROOT" |
191 elif test "x$TOOLCHAIN_TYPE" = xclang; then |
182 elif test "x$TOOLCHAIN_TYPE" = xclang; then |
192 $1SYSROOT_CFLAGS="-isysroot [$]$1SYSROOT" |
183 $1SYSROOT_CFLAGS="-isysroot [$]$1SYSROOT" |
193 $1SYSROOT_LDFLAGS="-isysroot [$]$1SYSROOT" |
184 $1SYSROOT_LDFLAGS="-isysroot [$]$1SYSROOT" |
194 fi |
185 fi |
195 # Propagate the sysroot args to hotspot |
|
196 $1LEGACY_EXTRA_CFLAGS="[$]$1LEGACY_EXTRA_CFLAGS [$]$1SYSROOT_CFLAGS" |
|
197 $1LEGACY_EXTRA_CXXFLAGS="[$]$1LEGACY_EXTRA_CXXFLAGS [$]$1SYSROOT_CFLAGS" |
|
198 $1LEGACY_EXTRA_LDFLAGS="[$]$1LEGACY_EXTRA_LDFLAGS [$]$1SYSROOT_LDFLAGS" |
|
199 # The global CFLAGS and LDFLAGS variables need these for configure to function |
186 # The global CFLAGS and LDFLAGS variables need these for configure to function |
200 $1CFLAGS="[$]$1CFLAGS [$]$1SYSROOT_CFLAGS" |
187 $1CFLAGS="[$]$1CFLAGS [$]$1SYSROOT_CFLAGS" |
201 $1CPPFLAGS="[$]$1CPPFLAGS [$]$1SYSROOT_CFLAGS" |
188 $1CPPFLAGS="[$]$1CPPFLAGS [$]$1SYSROOT_CFLAGS" |
202 $1CXXFLAGS="[$]$1CXXFLAGS [$]$1SYSROOT_CFLAGS" |
189 $1CXXFLAGS="[$]$1CXXFLAGS [$]$1SYSROOT_CFLAGS" |
203 $1LDFLAGS="[$]$1LDFLAGS [$]$1SYSROOT_LDFLAGS" |
190 $1LDFLAGS="[$]$1LDFLAGS [$]$1SYSROOT_LDFLAGS" |