arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-21 15:08:12 +00:00
Code Issues Releases Wiki Activity

build(core,legacy): remove gcc, use cc instead of gcc

Browse Source 
for firmware builds we still use arm-none-eabi-gcc via $(PREFIX)gcc

[no changelog]
This commit is contained in:
Pavol Rusnak 2022-04-27 12:04:35 +02:00 committed by matejcik
parent 7912a7d0d3
commit 8f1d33d5f9
9 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/shell.nix
View File

@ -39,7 +39,6 @@ let
# to use official binary, remove rustfmt from buildInputs and add it to extensions: # to use official binary, remove rustfmt from buildInputs and add it to extensions:
extensions = [ "clippy" ]; extensions = [ "clippy" ];
}; };
gcc = nixpkgs.gcc11;
llvmPackages = nixpkgs.llvmPackages_13; llvmPackages = nixpkgs.llvmPackages_13;
# see pyright/README.md for update procedure # see pyright/README.md for update procedure
pyright = nixpkgs.callPackage ./pyright {}; pyright = nixpkgs.callPackage ./pyright {};
@ -77,7 +76,6 @@ stdenvNoCC.mkDerivation ({
check check
curl # for connect tests curl # for connect tests
editorconfig-checker editorconfig-checker
gcc
gcc-arm-embedded gcc-arm-embedded
git git
gitAndTools.git-subrepo gitAndTools.git-subrepo

2
core/SConscript.firmware
View File

@ -680,7 +680,7 @@ if FROZEN:
if FEATURE_FLAGS["SECP256K1_ZKP"]: if FEATURE_FLAGS["SECP256K1_ZKP"]:
host_env = Environment(ENV=os.environ) host_env = Environment(ENV=os.environ)
host_env.Replace( host_env.Replace(
CC=os.getenv('CC_FOR_BUILD') or 'gcc', CC=os.getenv('CC_FOR_BUILD') or 'cc',
COPT='-O2', COPT='-O2',
CPPPATH='vendor/secp256k1-zkp', CPPPATH='vendor/secp256k1-zkp',
CPPDEFINES=[ CPPDEFINES=[

2
core/SConscript.unix
View File

@ -641,7 +641,7 @@ if FROZEN:
if FEATURE_FLAGS["SECP256K1_ZKP"]: if FEATURE_FLAGS["SECP256K1_ZKP"]:
host_env = Environment(ENV=os.environ) host_env = Environment(ENV=os.environ)
host_env.Replace( host_env.Replace(
CC=os.getenv('CC_FOR_BUILD') or 'gcc', CC=os.getenv('CC_FOR_BUILD') or 'cc',
COPT='-O2', COPT='-O2',
CPPPATH='vendor/secp256k1-zkp', CPPPATH='vendor/secp256k1-zkp',
CPPDEFINES=[ CPPDEFINES=[

2
crypto/Makefile
View File

@ -35,7 +35,7 @@ else ifeq ($(ADDRESS_SANITIZER),1)
SANFLAGS += -fsanitize=address,undefined SANFLAGS += -fsanitize=address,undefined
endif endif
CC ?= gcc CC ?= cc
OPTFLAGS ?= -O3 -g OPTFLAGS ?= -O3 -g

4
legacy/Makefile.include
View File

@ -6,10 +6,10 @@ Q := @
endif endif
PYTHON ?= python PYTHON ?= python
CC_FOR_BUILD ?= gcc CC_FOR_BUILD ?= cc
ifeq ($(EMULATOR),1) ifeq ($(EMULATOR),1)
CC ?= gcc CC ?= cc
LD := $(CC) LD := $(CC)
OBJCOPY := true OBJCOPY := true
OBJDUMP := true OBJDUMP := true

2
legacy/gen/Makefile
View File

@ -1,4 +1,4 @@
CC=gcc CC=cc
all: strwidth all: strwidth

2
storage/tests/c/Makefile
View File

@ -1,4 +1,4 @@
CC = gcc CC = cc
CFLAGS = -Wall -Wshadow -Wextra -Wpedantic -Werror -Wno-missing-braces -fPIC -fsanitize=address,undefined CFLAGS = -Wall -Wshadow -Wextra -Wpedantic -Werror -Wno-missing-braces -fPIC -fsanitize=address,undefined
LIBS = LIBS =
INC = -I ../../../crypto -I ../.. -I . INC = -I ../../../crypto -I ../.. -I .

2
storage/tests/c0/Makefile
View File

@ -1,4 +1,4 @@
CC=gcc CC=cc
CFLAGS=-Wall -fPIC CFLAGS=-Wall -fPIC
LIBS= LIBS=
OBJ=storage.o norcow.o flash.o OBJ=storage.o norcow.o flash.o

4
tests/fido_tests/u2f-tests-hid/Makefile
View File

@ -6,8 +6,8 @@
all: HIDTest U2FTest all: HIDTest U2FTest
CC ?= gcc CC ?= cc
CXX ?= g++ CXX ?= c++
CFLAGS ?= -Wall CFLAGS ?= -Wall
%.o: %.c %.o: %.c