diff options
Diffstat (limited to 'build/c/gnu/configure')
| -rwxr-xr-x | build/c/gnu/configure | 37 |
1 files changed, 34 insertions, 3 deletions
diff --git a/build/c/gnu/configure b/build/c/gnu/configure index dad0904..827b558 100755 --- a/build/c/gnu/configure +++ b/build/c/gnu/configure @@ -7,6 +7,8 @@ # $1 out file # $2 optimize (y/n) +# $3 c_extra_options +# $4 c_ld_extra_options # # bld_root - build root # project_name - project name @@ -27,8 +29,32 @@ $echo "'/usr/local/bin/gcc' or 'distcc gcc'." $echo c_gnu=`read_path --command gcc` -c_gnu_libraries=`$c_gnu -print-search-dirs | sed -e 's/libraries: =//p' -e d` +# Pass c_extra_options and c_ld_extra_options since those can affect the +# search paths (e.g., -m32) and target. +# +c_gnu_libraries=`$c_gnu $3 $4 -print-search-dirs | sed -e 's/libraries: =//p' -e d` + +c_gnu_target=`$c_gnu $3 $4 -dumpmachine` +c_gnu_target=`$bld_root/system/config.sub "$c_gnu_target"` + +if [ $? != 0 ]; then + $echo "unable to canonicalize target system '$c_gnu_target'" + exit 1 +fi + +c_gnu_target_cpu=`echo $c_gnu_target | cut -f 1 -d -` +c_gnu_target_mf=`echo $c_gnu_target | cut -f 2 -d -` +c_gnu_target_kernel=`echo $c_gnu_target | cut -f 3 -d -` +c_gnu_target_os=`echo $c_gnu_target | cut -f 4 -d -` + +if [ -z "$c_gnu_target_os" ]; then + + # Old format: cpu-mf-os + # + c_gnu_target_os=$c_gnu_target_kernel + c_gnu_target_kernel= +fi optimization= @@ -50,6 +76,11 @@ if [ "$2" == "y" ]; then fi -echo "c_gnu := $c_gnu" > $1 -echo "c_gnu_libraries := $c_gnu_libraries" >> $1 +echo "c_gnu := $c_gnu" > $1 +echo "c_gnu_libraries := $c_gnu_libraries" >> $1 echo "c_gnu_optimization_options := $optimization" >> $1 +echo "c_gnu_target := $c_gnu_target" >> $1 +echo "c_gnu_target_cpu := $c_gnu_target_cpu" >> $1 +echo "c_gnu_target_mf := $c_gnu_target_mf" >> $1 +echo "c_gnu_target_kernel := $c_gnu_target_kernel" >> $1 +echo "c_gnu_target_os := $c_gnu_target_os" >> $1 |