Skip to content

Commit e598a4c

Browse files
Mic92Mic92
committed
nxp: patch toolchain more consistent between different targets
1 parent a2bc098 commit e598a4c

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

‎compulab/ucm-imx95/bsp/ucm-imx95-optee-os.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ let
88
binutils = pkgs.gccStdenv.cc.bintools.bintools_bin;
99
cpp = pkgs.gccStdenv.cc;
1010
in
11-
pkgs.stdenv.mkDerivation rec {
11+
pkgs.stdenv.mkDerivation {
1212
pname = "imx95-optee-os";
1313
version = "lf-6.6.36_2.1.0";
1414

@@ -62,7 +62,7 @@ pkgs.stdenv.mkDerivation rec {
6262
substituteInPlace mk/gcc.mk \
6363
--replace-fail "\$(CROSS_COMPILE_\$(sm))ar" ${binutils}/bin/${toolchain.targetPrefix}ar
6464
substituteInPlace mk/gcc.mk \
65-
--replace-fail "\$(CROSS_COMPILE_\$(sm))cpp" ${cpp}/bin/cpp
65+
--replace-fail "\$(CROSS_COMPILE_\$(sm))cpp" ${cpp}/bin/${toolchain.targetPrefix}cpp
6666
'';
6767

6868
makeFlags = [

‎nxp/common/bsp/imx-optee-builder.nix‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ let
1515
inherit (pkgs.buildPackages) python3;
1616
toolchain = pkgs.gccStdenv.cc;
1717
binutils = pkgs.gccStdenv.cc.bintools.bintools_bin;
18-
cpp = pkgs.gcc;
18+
cpp = pkgs.gccStdenv.gcc;
1919

2020
# Determine PLATFORM and PLATFORM_FLAVOR from platformFlavor
2121
# Format can be either "imx-mx93evk" (full platform string) or "mx8mpevk" (just flavor, platform is "imx")
@@ -48,17 +48,17 @@ pkgs.stdenv.mkDerivation {
4848
4949
# Patch toolchain paths in mk/gcc.mk
5050
substituteInPlace mk/gcc.mk \
51-
--replace "\$(CROSS_COMPILE_\$(sm))objcopy" ${binutils}/bin/${toolchain.targetPrefix}objcopy
51+
--replace-fail "\$(CROSS_COMPILE_\$(sm))objcopy" ${binutils}/bin/${toolchain.targetPrefix}objcopy
5252
substituteInPlace mk/gcc.mk \
53-
--replace "\$(CROSS_COMPILE_\$(sm))objdump" ${binutils}/bin/${toolchain.targetPrefix}objdump
53+
--replace-fail "\$(CROSS_COMPILE_\$(sm))objdump" ${binutils}/bin/${toolchain.targetPrefix}objdump
5454
substituteInPlace mk/gcc.mk \
55-
--replace "\$(CROSS_COMPILE_\$(sm))nm" ${binutils}/bin/${toolchain.targetPrefix}nm
55+
--replace-fail "\$(CROSS_COMPILE_\$(sm))nm" ${binutils}/bin/${toolchain.targetPrefix}nm
5656
substituteInPlace mk/gcc.mk \
57-
--replace "\$(CROSS_COMPILE_\$(sm))readelf" ${binutils}/bin/${toolchain.targetPrefix}readelf
57+
--replace-fail "\$(CROSS_COMPILE_\$(sm))readelf" ${binutils}/bin/${toolchain.targetPrefix}readelf
5858
substituteInPlace mk/gcc.mk \
59-
--replace "\$(CROSS_COMPILE_\$(sm))ar" ${binutils}/bin/${toolchain.targetPrefix}ar
59+
--replace-fail "\$(CROSS_COMPILE_\$(sm))ar" ${binutils}/bin/${toolchain.targetPrefix}ar
6060
substituteInPlace mk/gcc.mk \
61-
--replace "\$(CROSS_COMPILE_\$(sm))cpp" ${cpp}/bin/cpp
61+
--replace-fail "\$(CROSS_COMPILE_\$(sm))cpp"${cpp}/bin/${toolchain.targetPrefix}cpp
6262
'';
6363

6464
makeFlags = [

‎nxp/common/bsp/imx-optee-os.nix‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ let
1717
cpp = pkgs.buildPackages.gcc;
1818

1919
in
20-
pkgs.stdenv.mkDerivation rec {
20+
pkgs.stdenv.mkDerivation {
2121

2222
pname = "imx-optee-os";
2323
version = "5.15.32_2.0.0";
@@ -41,25 +41,25 @@ pkgs.stdenv.mkDerivation rec {
4141

4242
postPatch = ''
4343
substituteInPlace scripts/arm32_sysreg.py \
44-
--replace '/usr/bin/env python3' '${python3}/bin/python'
44+
--replace-fail '/usr/bin/env python3' '${python3}/bin/python'
4545
substituteInPlace scripts/gen_tee_bin.py \
46-
--replace '/usr/bin/env python3' '${python3}/bin/python'
46+
--replace-fail '/usr/bin/env python3' '${python3}/bin/python'
4747
substituteInPlace scripts/pem_to_pub_c.py \
48-
--replace '/usr/bin/env python3' '${python3}/bin/python'
48+
--replace-fail '/usr/bin/env python3' '${python3}/bin/python'
4949
substituteInPlace ta/pkcs11/scripts/verify-helpers.sh \
50-
--replace '/bin/bash' '${pkgs.bash}/bin/bash'
50+
--replace-fail '/bin/bash' '${pkgs.bash}/bin/bash'
5151
substituteInPlace mk/gcc.mk \
52-
--replace "\$(CROSS_COMPILE_\$(sm))objcopy" ${binutils}/bin/${toolchain.targetPrefix}objcopy
52+
--replace-fail "\$(CROSS_COMPILE_\$(sm))objcopy" ${binutils}/bin/${toolchain.targetPrefix}objcopy
5353
substituteInPlace mk/gcc.mk \
54-
--replace "\$(CROSS_COMPILE_\$(sm))objdump" ${binutils}/bin/${toolchain.targetPrefix}objdump
54+
--replace-fail "\$(CROSS_COMPILE_\$(sm))objdump" ${binutils}/bin/${toolchain.targetPrefix}objdump
5555
substituteInPlace mk/gcc.mk \
56-
--replace "\$(CROSS_COMPILE_\$(sm))nm" ${binutils}/bin/${toolchain.targetPrefix}nm
56+
--replace-fail "\$(CROSS_COMPILE_\$(sm))nm" ${binutils}/bin/${toolchain.targetPrefix}nm
5757
substituteInPlace mk/gcc.mk \
58-
--replace "\$(CROSS_COMPILE_\$(sm))readelf" ${binutils}/bin/${toolchain.targetPrefix}readelf
58+
--replace-fail "\$(CROSS_COMPILE_\$(sm))readelf" ${binutils}/bin/${toolchain.targetPrefix}readelf
5959
substituteInPlace mk/gcc.mk \
60-
--replace "\$(CROSS_COMPILE_\$(sm))ar" ${binutils}/bin/${toolchain.targetPrefix}ar
60+
--replace-fail "\$(CROSS_COMPILE_\$(sm))ar" ${binutils}/bin/${toolchain.targetPrefix}ar
6161
substituteInPlace mk/gcc.mk \
62-
--replace "\$(CROSS_COMPILE_\$(sm))cpp" ${cpp}/bin/cpp
62+
--replace-fail "\$(CROSS_COMPILE_\$(sm))cpp" "${cpp}/bin/${toolchain.targetPrefix}cpp"
6363
'';
6464

6565
makeFlags = [

0 commit comments

Comments
 (0)