Commit82a6264

authored

Merge pull request#39 from clementperon/patch-1

Don't override CROSS_COMPILE if it's already set

2 parentsfa5b1ff +0f8cf01 commit82a6264Copy full SHA for 82a6264

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ default: $(TARGET_BOOTCODE)`
`42`	`42`	`OBJ :=$(addprefix$(TARGET_BUILD_DIR)/,$(addsuffix .o,$(basename$(SRCS))))`
`43`	`43`
`44`	`44`	`# the cross compiler should already be in your path`
`45`		`-CROSS_COMPILE = vc4-elf-`
	`45`	`+CROSS_COMPILE?= vc4-elf-`
`46`	`46`	`CC =$(CROSS_COMPILE)gcc`
`47`	`47`	`CXX =$(CROSS_COMPILE)g++`
`48`	`48`	`AS =$(CC)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ default: $(TARGET_ARM_CHAINLOADER)`
`46`	`46`
`47`	`47`	`OBJ :=$(addprefix$(TARGET_BUILD_DIR)/,$(addsuffix .o,$(basename$(SRCS))))`
`48`	`48`
`49`		`-CROSS_COMPILE = arm-none-eabi-`
	`49`	`+CROSS_COMPILE?= arm-none-eabi-`
`50`	`50`	`CC =$(CROSS_COMPILE)gcc`
`51`	`51`	`CXX =$(CROSS_COMPILE)gcc`
`52`	`52`	`AS =$(CC)`

Comments

(0)