David Runge pushed to branch main at Arch Linux / Packaging / Packages / edk2


Commits:
d083ba5c by Yichao Yu at 2025-02-04T17:28:43-05:00
Clean up of build script

- Swich from GCC5 to GCC. GCC5 was deprecated has been deprecated since GCC was 
added in 202305 
(https://github.com/tianocore/edk2/commit/757f502a3b350436877102c3043744e021537c19)
- Use the correct environment variable to set GCC prefix on x86
  `GCC*_{IA32,X64}_PREFIX` has always been set from `GCC*_BIN` environment 
variable.
  Also set the prefix to empty (which is the default) since binutils does not 
provide `x86_64-linux-gnu-objcopy`.
- Build the tool only once.

- - - - -


1 changed file:

- PKGBUILD


Changes:

=====================================
PKGBUILD
=====================================
@@ -114,7 +114,7 @@ 
b2sums=('fb2977af32fd2f33bfc661cb6c4b28a7f5d390c498122b26920cf18d1c3c0f29f19c618
         
'0c1e145109de9a25339633b563e47f6c09ea314f636023d09a58559a499dd0bd283a45e050fc99fe34c4d712bd00a035064fa8406734d57029c67b9adb4b11ce')
 _arch_list=(ARM AARCH64 IA32 X64)
 _build_type=RELEASE
-_build_plugin=GCC5
+_build_plugin=GCC
 
 prepare() {
   local submodule
@@ -197,14 +197,12 @@ build() {
   )
 
   cd $pkgbase
-  export GCC5_IA32_PREFIX="x86_64-linux-gnu-"
-  export GCC5_X64_PREFIX="x86_64-linux-gnu-"
-  export GCC5_AARCH64_PREFIX="aarch64-linux-gnu-"
-  export GCC5_ARM_PREFIX="arm-none-eabi-"
-  echo "Building base tools (AARCH64)"
-  ARCH=AARCH64 make -C BaseTools
-  echo "Building base tools (ARM)"
-  ARCH=ARM make -C BaseTools
+  # This is used as the prefix for both gcc and objcopy
+  # so it cannot be set to x86_64-linux-gnu-
+  # (binutils does not provide x86_64-linux-gnu-objcopy)
+  export GCC_BIN=""
+  export GCC_AARCH64_PREFIX="aarch64-linux-gnu-"
+  export GCC_ARM_PREFIX="arm-none-eabi-"
   echo "Building base tools"
   make -C BaseTools
   # expose build tooling in PATH



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/edk2/-/commit/d083ba5ccccbed6285d03b56574fa46a8a829e59

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/edk2/-/commit/d083ba5ccccbed6285d03b56574fa46a8a829e59
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to