Browse Source

carl9170-firmware: fix avoid-use-in-tree-toolchain.patch

tags/milky-way/v0.3
André Silva 1 year ago
parent
commit
301dbc4af5
2 changed files with 9 additions and 9 deletions
  1. +1
    -1
      carl9170-firmware/PKGBUILD
  2. +8
    -8
      carl9170-firmware/avoid-use-in-tree-toolchain.patch

+ 1
- 1
carl9170-firmware/PKGBUILD View File

@@ -18,7 +18,7 @@ source=("$_pkgname-$pkgver.tar.gz::https://github.com/chunkeey/carl9170fw/archiv
'avoid-use-in-tree-toolchain.patch')
sha512sums=('ba57738d10662228cee8a5013ab6161045abbddf0a72c33ba4ebc8e7d8bd7f56cd5745ba5f03669069027562e2bae764bb4aa2f8c0e0d6dddb2fe516832d63d6'
'645848ed5fbacb78207a94be2763d56943315ce75f0c2ffa4731b82b2cb0bacf236e75b0a504ca683b0c673038b0d9e3336bd7bae512abf8eda24fcab7eda147'
'13a59b51066bf512190e621229d065e4fc6719cb337099bbf8e8078bab211f0237e80ee58c94e553612ee14e380b501fcb1d2b4ed53e619827b937a245173efc')
'6a4420358bac4128c28884e1c33b10e3c455137225a391c20a21739a4051f0132326fce9b88f7092ed0d13ce2589d5d8a7cfb113fe233595694689a6d2ec84a6')

prepare() {
cd $_pkgname-$pkgver

+ 8
- 8
carl9170-firmware/avoid-use-in-tree-toolchain.patch View File

@@ -1,5 +1,5 @@
diff --git a/extra/sh-elf-linux.cmake b/extra/sh-elf-linux.cmake
index 2429436..476f344 100644
index 2429436..9a46a99 100644
--- a/extra/sh-elf-linux.cmake
+++ b/extra/sh-elf-linux.cmake
@@ -3,18 +3,18 @@ set(CMAKE_SYSTEM_PROCESSOR "sh2")
@@ -19,13 +19,13 @@ index 2429436..476f344 100644
-set(CMAKE_ASM-ATT_COMPILER ${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-as)
-set(CMAKE_LINKER ${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-ld)
-set(CMAKE_C_LINK_EXECUTABLE "${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-gcc <OBJECTS> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> -o <TARGET>")
+set(OBJCOPY /bin/sh-unknown-elf-objcopy)
+set(CMAKE_C_COMPILER "/bin/sh-unknown-elf-gcc")
+set(CMAKE_AR /bin/sh-unknown-elf-ar)
+set(CMAKE_ASM_COMPILER /bin/sh-unknown-elf-as)
+set(CMAKE_ASM-ATT_COMPILER /bin/sh-unknown-elf-as)
+set(CMAKE_LINKER /bin/sh-unknown-elf-ld)
+set(CMAKE_C_LINK_EXECUTABLE "/bin/sh-unknown-elf-gcc <OBJECTS> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> -o <TARGET>")
+set(OBJCOPY /usr/bin/sh-unknown-elf-objcopy)
+set(CMAKE_C_COMPILER "/usr/bin/sh-unknown-elf-gcc")
+set(CMAKE_AR /usr/bin/sh-unknown-elf-ar)
+set(CMAKE_ASM_COMPILER /usr/bin/sh-unknown-elf-as)
+set(CMAKE_ASM-ATT_COMPILER /usr/bin/sh-unknown-elf-as)
+set(CMAKE_LINKER /usr/bin/sh-unknown-elf-ld)
+set(CMAKE_C_LINK_EXECUTABLE "/usr/bin/sh-unknown-elf-gcc <OBJECTS> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> -o <TARGET>")
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)

Loading…
Cancel
Save