diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2018-06-07 12:18:32 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2018-06-07 12:20:47 +0300 |
| commit | bb63502f0b47f74c7b53166200e6840f1ae65ebc (patch) | |
| tree | 83efc43bcc11d9c9f78c3be080bb86331fe1a236 /gnu/packages/firmware.scm | |
| parent | 6d095c4cabfe03520ca32545632a538da9c8d6da (diff) | |
| download | guix-patches-bb63502f0b47f74c7b53166200e6840f1ae65ebc.tar guix-patches-bb63502f0b47f74c7b53166200e6840f1ae65ebc.tar.gz | |
gnu: ovmf: Simplify build.
* gnu/packages/firmware.scm (ovmf)[arguments]: Change custom 'build-ia32
phase to replace 'build. Remove unneeded substitutions in 'configure,
'build and 'build-x64. Shorten 'build and 'build-x64 phases.
Diffstat (limited to 'gnu/packages/firmware.scm')
| -rw-r--r-- | gnu/packages/firmware.scm | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 986e1d6219..7aaa9f36fd 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -262,36 +262,26 @@ coreboot.") (setenv "PATH" (string-append (getenv "PATH") ":" bin)) ; FIXME: The below script errors out. When using 'invoke' instead ; of 'system*' this causes the build to fail. - (system* "bash" "edksetup.sh" "BaseTools") + (system* "bash" "edksetup.sh") (substitute* "Conf/target.txt" (("^TARGET[ ]*=.*$") "TARGET = RELEASE\n") - (("^TOOL_CHAIN_TAG[ ]*=.*$") "TOOL_CHAIN_TAG = GCC49\n") (("^MAX_CONCURRENT_THREAD_NUMBER[ ]*=.*$") (format #f "MAX_CONCURRENT_THREAD_NUMBER = ~a~%" (number->string (parallel-job-count))))) ;; Build build support. (setenv "BUILD_CC" "gcc") - (invoke "make" "-C" (string-append tools "/Source/C")) + (invoke "make" "-C" tools) #t))) - (add-after 'build 'build-ia32 + (replace 'build (lambda _ - (substitute* "Conf/target.txt" - (("^TARGET_ARCH[ ]*=.*$") "TARGET_ARCH = IA32\n") - (("^ACTIVE_PLATFORM[ ]*=.*$") - "ACTIVE_PLATFORM = OvmfPkg/OvmfPkgIa32.dsc\n")) - (invoke "build") - #t)) + (invoke "build" "-a" "IA32" "-t" "GCC49" + "-p" "OvmfPkg/OvmfPkgIa32.dsc"))) ,@(if (string=? "x86_64-linux" (%current-system)) '((add-after 'build 'build-x64 (lambda _ - (substitute* "Conf/target.txt" - (("^TARGET_ARCH[ ]*=.*$") "TARGET_ARCH = X64\n") - (("^ACTIVE_PLATFORM[ ]*=.*$") - "ACTIVE_PLATFORM = OvmfPkg/OvmfPkgX64.dsc\n")) - (invoke "build") - #t))) + (invoke "build" "-a" "X64" "-t" "GCC49" + "-p" "OvmfPkg/OvmfPkgX64.dsc")))) '()) - (delete 'build) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) |