public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lua: use stdenv.cc.targetPrefix

Browse Source 
This evaluates to an empty string when not cross compiling, so by
using this instead of stdenv.hostPlatform.config we can eliminate a
conditional.
This commit is contained in:
Alyssa Ross 2021-04-19 11:09:36 +00:00
parent 8abdf1db65
commit 25d4f0d334
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/interpreters/lua-5/interpreter.nix
View File

@ -54,17 +54,15 @@ self = stdenv.mkDerivation rec {
"LDFLAGS=-fPIC" "LDFLAGS=-fPIC"
"V=${luaversion}" "V=${luaversion}"
"PLAT=${plat}" "PLAT=${plat}"
] ++ (if stdenv.buildPlatform != stdenv.hostPlatform then [ "CC=${stdenv.cc.targetPrefix}cc"
"CC=${stdenv.hostPlatform.config}-gcc" "RANLIB=${stdenv.cc.targetPrefix}ranlib"
"RANLIB=${stdenv.hostPlatform.config}-ranlib" ];
] else [])
;
configurePhase = '' configurePhase = ''
runHook preConfigure runHook preConfigure
makeFlagsArray+=(CFLAGS='-O2 -fPIC${lib.optionalString compat " -DLUA_COMPAT_ALL"} $(SYSCFLAGS)' ) makeFlagsArray+=(CFLAGS='-O2 -fPIC${lib.optionalString compat " -DLUA_COMPAT_ALL"} $(SYSCFLAGS)' )
makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.hostPlatform.config}-ar rcu'"}) makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.cc.targetPrefix}ar rcu'"})
installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \ installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \
TO_LIB="${if stdenv.isDarwin then "liblua.${version}.dylib" else "liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}"}" ) TO_LIB="${if stdenv.isDarwin then "liblua.${version}.dylib" else "liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}"}" )