cc-wrapper: Leverage the setup script instead of buildCommand
This commit is contained in:
John Ericson
John Ericson
parent
dc47e763c1
commit
df7c305c4c
@ -112,7 +112,14 @@ stdenv.mkDerivation {
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
buildCommand =
|
dontBuild = true;
|
||||||
|
dontConfigure = true;
|
||||||
|
|
||||||
|
unpackPhase = ''
|
||||||
|
src=$PWD
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase =
|
||||||
''
|
''
|
||||||
set -u
|
set -u
|
||||||
|
|
||||||
@ -127,103 +134,16 @@ stdenv.mkDerivation {
|
|||||||
}
|
}
|
||||||
''
|
''
|
||||||
|
|
||||||
+ optionalString (libc != null) (''
|
|
||||||
if [[ -z ''${dynamicLinker+x} ]]; then
|
|
||||||
echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2
|
|
||||||
dynamicLinker="${libc_lib}/lib/ld*.so.?"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Expand globs to fill array of options
|
|
||||||
dynamicLinker=($dynamicLinker)
|
|
||||||
|
|
||||||
case ''${#dynamicLinker[@]} in
|
|
||||||
0) echo "No dynamic linker found for platform '${targetPlatform.config}'." >&2;;
|
|
||||||
1) echo "Using dynamic linker: '$dynamicLinker'" >&2;;
|
|
||||||
*) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ -n "$dynamicLinker" ]; then
|
|
||||||
echo $dynamicLinker > $out/nix-support/dynamic-linker
|
|
||||||
|
|
||||||
'' + (if targetPlatform.isDarwin then ''
|
|
||||||
printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook
|
|
||||||
'' else ''
|
|
||||||
if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then
|
|
||||||
echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
|
|
||||||
fi
|
|
||||||
|
|
||||||
ldflagsBefore=(-dynamic-linker "$dynamicLinker")
|
|
||||||
'') + ''
|
|
||||||
fi
|
|
||||||
|
|
||||||
# The dynamic linker is passed in `ldflagsBefore' to allow
|
|
||||||
# explicit overrides of the dynamic linker by callers to gcc/ld
|
|
||||||
# (the *last* value counts, so ours should come first).
|
|
||||||
printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before
|
|
||||||
'')
|
|
||||||
|
|
||||||
+ optionalString (libc != null) ''
|
|
||||||
# The "-B${libc_lib}/lib/" flag is a quick hack to force gcc to link
|
|
||||||
# against the crt1.o from our own glibc, rather than the one in
|
|
||||||
# /usr/lib. (This is only an issue when using an `impure'
|
|
||||||
# compiler/linker, i.e., one that searches /usr/lib and so on.)
|
|
||||||
#
|
|
||||||
# Unfortunately, setting -B appears to override the default search
|
|
||||||
# path. Thus, the gcc-specific "../includes-fixed" directory is
|
|
||||||
# now longer searched and glibc's <limits.h> header fails to
|
|
||||||
# compile, because it uses "#include_next <limits.h>" to find the
|
|
||||||
# limits.h file in ../includes-fixed. To remedy the problem,
|
|
||||||
# another -idirafter is necessary to add that directory again.
|
|
||||||
echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include -idirafter ${cc}/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
|
|
||||||
|
|
||||||
echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags
|
|
||||||
|
|
||||||
echo "${libc_lib}" > $out/nix-support/orig-libc
|
|
||||||
echo "${libc_dev}" > $out/nix-support/orig-libc-dev
|
|
||||||
''
|
|
||||||
|
|
||||||
+ (if nativeTools then ''
|
+ (if nativeTools then ''
|
||||||
|
echo ${if targetPlatform.isDarwin then cc else nativePrefix} > $out/nix-support/orig-cc
|
||||||
|
|
||||||
ccPath="${if targetPlatform.isDarwin then cc else nativePrefix}/bin"
|
ccPath="${if targetPlatform.isDarwin then cc else nativePrefix}/bin"
|
||||||
ldPath="${nativePrefix}/bin"
|
ldPath="${nativePrefix}/bin"
|
||||||
'' else ''
|
'' else ''
|
||||||
echo $cc > $out/nix-support/orig-cc
|
echo $cc > $out/nix-support/orig-cc
|
||||||
|
|
||||||
# GCC shows ${cc_solib}/lib in `gcc -print-search-dirs', but not
|
|
||||||
# ${cc_solib}/lib64 (even though it does actually search there...)..
|
|
||||||
# This confuses libtool. So add it to the compiler tool search
|
|
||||||
# path explicitly.
|
|
||||||
if [ -e "${cc_solib}/lib64" -a ! -L "${cc_solib}/lib64" ]; then
|
|
||||||
ccLDFlags+=" -L${cc_solib}/lib64"
|
|
||||||
ccCFlags+=" -B${cc_solib}/lib64"
|
|
||||||
fi
|
|
||||||
ccLDFlags+=" -L${cc_solib}/lib"
|
|
||||||
ccCFlags+=" -B${cc_solib}/lib"
|
|
||||||
|
|
||||||
${optionalString cc.langVhdl or false ''
|
|
||||||
ccLDFlags+=" -L${zlib.out}/lib"
|
|
||||||
''}
|
|
||||||
|
|
||||||
# Find the gcc libraries path (may work only without multilib).
|
|
||||||
${optionalString cc.langAda or false ''
|
|
||||||
basePath=`echo ${cc_solib}/lib/*/*/*`
|
|
||||||
ccCFlags+=" -B$basePath -I$basePath/adainclude"
|
|
||||||
gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib"
|
|
||||||
echo "$gnatCFlags" > $out/nix-support/gnat-cflags
|
|
||||||
''}
|
|
||||||
|
|
||||||
echo "$ccLDFlags" > $out/nix-support/cc-ldflags
|
|
||||||
echo "$ccCFlags" > $out/nix-support/cc-cflags
|
|
||||||
|
|
||||||
ccPath="${cc}/bin"
|
ccPath="${cc}/bin"
|
||||||
ldPath="${binutils_bin}/bin"
|
ldPath="${binutils_bin}/bin"
|
||||||
|
|
||||||
# Propagate the wrapped cc so that if you install the wrapper,
|
|
||||||
# you get tools like gcov, the manpages, etc. as well (including
|
|
||||||
# for binutils and Glibc).
|
|
||||||
printWords ${cc} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
|
|
||||||
printWords ${cc.man or ""} > $man/nix-support/propagated-user-env-packages
|
|
||||||
|
|
||||||
printWords ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs
|
|
||||||
''
|
''
|
||||||
|
|
||||||
+ optionalString (targetPlatform.isSunOS && nativePrefix != "") ''
|
+ optionalString (targetPlatform.isSunOS && nativePrefix != "") ''
|
||||||
@ -314,12 +234,126 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
+ optionalString cc.langVhdl or false ''
|
+ optionalString cc.langVhdl or false ''
|
||||||
ln -s $ccPath/${prefix}ghdl $out/bin/${prefix}ghdl
|
ln -s $ccPath/${prefix}ghdl $out/bin/${prefix}ghdl
|
||||||
|
'';
|
||||||
|
|
||||||
|
propagatedBuildInputs = extraPackages;
|
||||||
|
|
||||||
|
setupHook = ./setup-hook.sh;
|
||||||
|
|
||||||
|
postFixup =
|
||||||
|
''
|
||||||
|
set -u
|
||||||
|
''
|
||||||
|
|
||||||
|
+ optionalString (libc != null) (''
|
||||||
|
##
|
||||||
|
## General libc support
|
||||||
|
##
|
||||||
|
|
||||||
|
# The "-B${libc_lib}/lib/" flag is a quick hack to force gcc to link
|
||||||
|
# against the crt1.o from our own glibc, rather than the one in
|
||||||
|
# /usr/lib. (This is only an issue when using an `impure'
|
||||||
|
# compiler/linker, i.e., one that searches /usr/lib and so on.)
|
||||||
|
#
|
||||||
|
# Unfortunately, setting -B appears to override the default search
|
||||||
|
# path. Thus, the gcc-specific "../includes-fixed" directory is
|
||||||
|
# now longer searched and glibc's <limits.h> header fails to
|
||||||
|
# compile, because it uses "#include_next <limits.h>" to find the
|
||||||
|
# limits.h file in ../includes-fixed. To remedy the problem,
|
||||||
|
# another -idirafter is necessary to add that directory again.
|
||||||
|
echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include -idirafter ${cc}/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
|
||||||
|
|
||||||
|
echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags
|
||||||
|
|
||||||
|
echo "${libc_lib}" > $out/nix-support/orig-libc
|
||||||
|
echo "${libc_dev}" > $out/nix-support/orig-libc-dev
|
||||||
|
|
||||||
|
##
|
||||||
|
## Dynamic linker support
|
||||||
|
##
|
||||||
|
|
||||||
|
if [[ -z ''${dynamicLinker+x} ]]; then
|
||||||
|
echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2
|
||||||
|
local dynamicLinker="${libc_lib}/lib/ld*.so.?"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Expand globs to fill array of options
|
||||||
|
dynamicLinker=($dynamicLinker)
|
||||||
|
|
||||||
|
case ''${#dynamicLinker[@]} in
|
||||||
|
0) echo "No dynamic linker found for platform '${targetPlatform.config}'." >&2;;
|
||||||
|
1) echo "Using dynamic linker: '$dynamicLinker'" >&2;;
|
||||||
|
*) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if [ -n "$dynamicLinker" ]; then
|
||||||
|
echo $dynamicLinker > $out/nix-support/dynamic-linker
|
||||||
|
|
||||||
|
'' + (if targetPlatform.isDarwin then ''
|
||||||
|
printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook
|
||||||
|
'' else ''
|
||||||
|
if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then
|
||||||
|
echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
|
||||||
|
fi
|
||||||
|
|
||||||
|
local ldflagsBefore=(-dynamic-linker "$dynamicLinker")
|
||||||
|
'') + ''
|
||||||
|
fi
|
||||||
|
|
||||||
|
# The dynamic linker is passed in `ldflagsBefore' to allow
|
||||||
|
# explicit overrides of the dynamic linker by callers to gcc/ld
|
||||||
|
# (the *last* value counts, so ours should come first).
|
||||||
|
printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before
|
||||||
|
'')
|
||||||
|
|
||||||
|
+ optionalString (!nativeTools) ''
|
||||||
|
|
||||||
|
##
|
||||||
|
## Initial CFLAGS
|
||||||
|
##
|
||||||
|
|
||||||
|
# GCC shows ${cc_solib}/lib in `gcc -print-search-dirs', but not
|
||||||
|
# ${cc_solib}/lib64 (even though it does actually search there...)..
|
||||||
|
# This confuses libtool. So add it to the compiler tool search
|
||||||
|
# path explicitly.
|
||||||
|
if [ -e "${cc_solib}/lib64" -a ! -L "${cc_solib}/lib64" ]; then
|
||||||
|
ccLDFlags+=" -L${cc_solib}/lib64"
|
||||||
|
ccCFlags+=" -B${cc_solib}/lib64"
|
||||||
|
fi
|
||||||
|
ccLDFlags+=" -L${cc_solib}/lib"
|
||||||
|
ccCFlags+=" -B${cc_solib}/lib"
|
||||||
|
|
||||||
|
${optionalString cc.langVhdl or false ''
|
||||||
|
ccLDFlags+=" -L${zlib.out}/lib"
|
||||||
|
''}
|
||||||
|
|
||||||
|
# Find the gcc libraries path (may work only without multilib).
|
||||||
|
${optionalString cc.langAda or false ''
|
||||||
|
basePath=`echo ${cc_solib}/lib/*/*/*`
|
||||||
|
ccCFlags+=" -B$basePath -I$basePath/adainclude"
|
||||||
|
gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib"
|
||||||
|
echo "$gnatCFlags" > $out/nix-support/gnat-cflags
|
||||||
|
''}
|
||||||
|
|
||||||
|
echo "$ccLDFlags" > $out/nix-support/cc-ldflags
|
||||||
|
echo "$ccCFlags" > $out/nix-support/cc-cflags
|
||||||
|
|
||||||
|
##
|
||||||
|
## User env support
|
||||||
|
##
|
||||||
|
|
||||||
|
# Propagate the wrapped cc so that if you install the wrapper,
|
||||||
|
# you get tools like gcov, the manpages, etc. as well (including
|
||||||
|
# for binutils and Glibc).
|
||||||
|
printWords ${cc} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
|
||||||
|
printWords ${cc.man or ""} > $man/nix-support/propagated-user-env-packages
|
||||||
''
|
''
|
||||||
|
|
||||||
+ ''
|
+ ''
|
||||||
substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook.tmp
|
|
||||||
cat $out/nix-support/setup-hook.tmp >> $out/nix-support/setup-hook
|
##
|
||||||
rm $out/nix-support/setup-hook.tmp
|
## Hardening support
|
||||||
|
##
|
||||||
|
|
||||||
# some linkers on some platforms don't support specific -z flags
|
# some linkers on some platforms don't support specific -z flags
|
||||||
export hardening_unsupported_flags=""
|
export hardening_unsupported_flags=""
|
||||||
@ -339,6 +373,11 @@ stdenv.mkDerivation {
|
|||||||
substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
|
substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
|
||||||
substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
|
substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
|
||||||
substituteAll ${./utils.sh} $out/nix-support/utils.sh
|
substituteAll ${./utils.sh} $out/nix-support/utils.sh
|
||||||
|
|
||||||
|
##
|
||||||
|
## Extra custom steps
|
||||||
|
##
|
||||||
|
|
||||||
''
|
''
|
||||||
+ extraBuildCommands;
|
+ extraBuildCommands;
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user