configure: whitespace cosmetics

pull/25/merge
Diego Biurrun 12 years ago
parent 6dc6598692
commit ace87c19ed
  1. 38
      configure

38
configure vendored

@ -2588,7 +2588,8 @@ probe_cc(){
_DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs' _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs'
_cflags_speed="-O2" _cflags_speed="-O2"
_cflags_size="-O1" _cflags_size="-O1"
# Nonstandard output options, to avoid msys path conversion issues, relies on wrapper to remap it # Nonstandard output options, to avoid msys path conversion issues.
# Relies on wrapper to remap it.
if $_cc 2>&1 | grep -q Linker; then if $_cc 2>&1 | grep -q Linker; then
_ld_o='-out $@' _ld_o='-out $@'
else else
@ -2608,10 +2609,12 @@ probe_cc(){
_type=icl _type=icl
_ident=$($cc 2>&1 | head -n1) _ident=$($cc 2>&1 | head -n1)
_depflags='-QMMD -QMF$(@:.o=.d) -QMT$@' _depflags='-QMMD -QMF$(@:.o=.d) -QMT$@'
# Not only is O3 broken on 13.x+ but it's slower on all previous versions (tested) as well # Not only is O3 broken on 13.x+ but it is slower on all previous
# versions (tested) as well.
_cflags_speed="-O2" _cflags_speed="-O2"
_cflags_size="-O1 -Oi" # -O1 without -Oi miscompiles stuff _cflags_size="-O1 -Oi" # -O1 without -Oi miscompiles stuff
# Nonstandard output options, to avoid msys path conversion issues, relies on wrapper to remap it # Nonstandard output options, to avoid msys path conversion issues.
# Relies on wrapper to remap it.
if $_cc 2>&1 | grep -q Linker; then if $_cc 2>&1 | grep -q Linker; then
_ld_o='-out $@' _ld_o='-out $@'
else else
@ -2622,9 +2625,10 @@ probe_cc(){
_flags_filter=icl_flags _flags_filter=icl_flags
_ld_lib='lib%.a' _ld_lib='lib%.a'
_ld_path='-libpath:' _ld_path='-libpath:'
# -Qdiag-error to make icl error when presented with certain unknown arguments # -Qdiag-error to make icl error when seeing certain unknown arguments
_flags='-nologo -Qdiag-error:4044,10157' _flags='-nologo -Qdiag-error:4044,10157'
# -Qvec- -Qsimd- to prevent miscompilation, -GS for consistency with msvc which enables it by default # -Qvec- -Qsimd- to prevent miscompilation, -GS for consistency
# with MSVC which enables it by default.
_cflags='-D_USE_MATH_DEFINES -FIstdlib.h -Dstrtoll=_strtoi64 -Qms0 -Qvec- -Qsimd- -GS' _cflags='-D_USE_MATH_DEFINES -FIstdlib.h -Dstrtoll=_strtoi64 -Qms0 -Qvec- -Qsimd- -GS'
if [ $pfx = hostcc ]; then if [ $pfx = hostcc ]; then
append _cflags -Dsnprintf=_snprintf append _cflags -Dsnprintf=_snprintf
@ -2725,7 +2729,8 @@ if test -n "$sysroot"; then
fi fi
if test "$cpu" = host; then if test "$cpu" = host; then
enabled cross_compile && die "--cpu=host makes no sense when cross-compiling." enabled cross_compile &&
die "--cpu=host makes no sense when cross-compiling."
case "$cc_type" in case "$cc_type" in
gcc|llvm_gcc) gcc|llvm_gcc)
@ -2741,7 +2746,8 @@ if test "$cpu" = host; then
;; ;;
esac esac
test "${cpu:-host}" = host && die "--cpu=host not supported with compiler $cc" test "${cpu:-host}" = host &&
die "--cpu=host not supported with compiler $cc"
fi fi
# Deal with common $arch aliases # Deal with common $arch aliases
@ -3059,7 +3065,9 @@ case $target_os in
# the Solaris assembler. As our libraries contain their own # the Solaris assembler. As our libraries contain their own
# guards for processor-specific code, instead suppress # guards for processor-specific code, instead suppress
# generation of the HWCAPS ELF section on Solaris x86 only. # generation of the HWCAPS ELF section on Solaris x86 only.
enabled_all suncc x86 && echo "hwcap_1 = OVERRIDE;" > mapfile && add_ldflags -Wl,-M,mapfile enabled_all suncc x86 &&
echo "hwcap_1 = OVERRIDE;" > mapfile &&
add_ldflags -Wl,-M,mapfile
nm_default='nm -P -g' nm_default='nm -P -g'
;; ;;
netbsd) netbsd)
@ -3133,8 +3141,7 @@ case $target_os in
# Link to the import library instead of the normal static library # Link to the import library instead of the normal static library
# for shared libs. # for shared libs.
LD_LIB='%.lib' LD_LIB='%.lib'
# Cannot build shared and static libraries at the same time with # Cannot build shared and static libs at the same time with MSVC.
# MSVC.
disable static disable static
fi fi
shlibdir_default="$bindir_default" shlibdir_default="$bindir_default"
@ -3795,7 +3802,8 @@ check_header sndio.h
check_header sys/soundcard.h check_header sys/soundcard.h
check_header soundcard.h check_header soundcard.h
enabled_any alsa_indev alsa_outdev && check_lib2 alsa/asoundlib.h snd_pcm_htimestamp -lasound enabled_any alsa_indev alsa_outdev &&
check_lib2 alsa/asoundlib.h snd_pcm_htimestamp -lasound
enabled jack_indev && check_lib2 jack/jack.h jack_client_open -ljack && enabled jack_indev && check_lib2 jack/jack.h jack_client_open -ljack &&
check_func jack_port_get_latency_range -ljack check_func jack_port_get_latency_range -ljack
@ -3803,7 +3811,8 @@ enabled jack_indev && check_lib2 jack/jack.h jack_client_open -ljack &&
enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio
if enabled libcdio; then if enabled libcdio; then
check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio || check_lib2 "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio ||
check_lib2 "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio
fi fi
enabled x11grab && enabled x11grab &&
@ -3948,9 +3957,10 @@ elif enabled pathscale; then
elif enabled_any msvc icl; then elif enabled_any msvc icl; then
enabled x86_32 && disable aligned_stack enabled x86_32 && disable aligned_stack
if enabled icl; then if enabled icl; then
# basically -fstrict-aliasing for icl that doesn't work (correctly) on 13.x+ # basically -fstrict-aliasing that does not work (correctly) on icl 13.x
check_cpp_condition "windows.h" "__ICL < 1300" && add_cflags -Qansi-alias check_cpp_condition "windows.h" "__ICL < 1300" && add_cflags -Qansi-alias
# icl will pass the inline asm tests but inline asm is currently not supported (build will fail) # icl will pass the inline asm tests but inline asm is currently
# not supported (build will fail)
disable inline_asm disable inline_asm
fi fi
fi fi

Loading…
Cancel
Save