Do not export CC, as it is exported above. Add OS X to gcc.sh
This commit is contained in:
parent
c80d3d35dc
commit
237fa73e80
2
Makefile
2
Makefile
|
@ -207,7 +207,6 @@ else
|
||||||
|
|
||||||
UNAME := $(shell uname)
|
UNAME := $(shell uname)
|
||||||
ifeq ($(UNAME),Darwin)
|
ifeq ($(UNAME),Darwin)
|
||||||
export CC=$(ARCH)-elf-gcc
|
|
||||||
ECHO=/bin/echo
|
ECHO=/bin/echo
|
||||||
FUMOUNT=sudo umount
|
FUMOUNT=sudo umount
|
||||||
export LD=$(ARCH)-elf-ld
|
export LD=$(ARCH)-elf-ld
|
||||||
|
@ -216,7 +215,6 @@ else
|
||||||
VB_AUDIO=coreaudio
|
VB_AUDIO=coreaudio
|
||||||
VBM="/Applications/VirtualBox.app/Contents/MacOS/VBoxManage"
|
VBM="/Applications/VirtualBox.app/Contents/MacOS/VBoxManage"
|
||||||
else
|
else
|
||||||
export CC=gcc
|
|
||||||
ECHO=echo
|
ECHO=echo
|
||||||
FUMOUNT=fusermount -u
|
FUMOUNT=fusermount -u
|
||||||
export LD=ld
|
export LD=ld
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 72fa53f638f25d7c03cbb4b413b59862f7298dae
|
Subproject commit 8d6a16bbca95f3308a77378e018aa852d179dd6e
|
Loading…
Reference in a new issue