busybox: add patch to allow cross in llvm
Fixes #57670 $ nix build -f. --arg crossSystem '{ config = "aarch64-unknown-linux-musl"; useLLVM = true; }' busybox
This commit is contained in:
parent
ef54604ce4
commit
3bf69b1e40
37
pkgs/os-specific/linux/busybox/clang-cross.patch
Normal file
37
pkgs/os-specific/linux/busybox/clang-cross.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index 6fedcffba..3385836c4 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -271,8 +271,8 @@ export quiet Q KBUILD_VERBOSE
|
||||||
|
# Look for make include files relative to root of kernel src
|
||||||
|
MAKEFLAGS += --include-dir=$(srctree)
|
||||||
|
|
||||||
|
-HOSTCC = gcc
|
||||||
|
-HOSTCXX = g++
|
||||||
|
+HOSTCC = cc
|
||||||
|
+HOSTCXX = c++
|
||||||
|
HOSTCFLAGS :=
|
||||||
|
HOSTCXXFLAGS :=
|
||||||
|
# We need some generic definitions
|
||||||
|
@@ -289,7 +289,7 @@ MAKEFLAGS += -rR
|
||||||
|
# Make variables (CC, etc...)
|
||||||
|
|
||||||
|
AS = $(CROSS_COMPILE)as
|
||||||
|
-CC = $(CROSS_COMPILE)gcc
|
||||||
|
+CC = $(CROSS_COMPILE)cc
|
||||||
|
LD = $(CC) -nostdlib
|
||||||
|
CPP = $(CC) -E
|
||||||
|
AR = $(CROSS_COMPILE)ar
|
||||||
|
diff --git a/scripts/Makefile.IMA b/scripts/Makefile.IMA
|
||||||
|
index f155108d7..185257064 100644
|
||||||
|
--- a/scripts/Makefile.IMA
|
||||||
|
+++ b/scripts/Makefile.IMA
|
||||||
|
@@ -39,7 +39,7 @@ ifndef HOSTCC
|
||||||
|
HOSTCC = cc
|
||||||
|
endif
|
||||||
|
AS = $(CROSS_COMPILE)as
|
||||||
|
-CC = $(CROSS_COMPILE)gcc
|
||||||
|
+CC = $(CROSS_COMPILE)cc
|
||||||
|
LD = $(CC) -nostdlib
|
||||||
|
CPP = $(CC) -E
|
||||||
|
AR = $(CROSS_COMPILE)ar
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./busybox-in-store.patch
|
./busybox-in-store.patch
|
||||||
];
|
] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.targetPlatform) ./clang-cross.patch;
|
||||||
|
|
||||||
postPatch = "patchShebangs .";
|
postPatch = "patchShebangs .";
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user