vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove CXX

Browse source
This commit is contained in:
Jeremy Soller 2017-01-02 16:20:51 -07:00
parent 9a97e65e68
commit 46c5ee0b4e
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -10,10 +10,6 @@ export CFLAGS=-nostartfiles -nostdlib -nodefaultlibs \
-isystem $(ROOT)/libc-artifacts/usr/lib/gcc/x86_64-elf-redox/7.0.0/include-fixed \ -isystem $(ROOT)/libc-artifacts/usr/lib/gcc/x86_64-elf-redox/7.0.0/include-fixed \
-isystem $(ROOT)/libc-artifacts/usr/include \ -isystem $(ROOT)/libc-artifacts/usr/include \
-fno-stack-protector -U_FORTIFY_SOURCE -fno-stack-protector -U_FORTIFY_SOURCE
export CXXFLAGS=$(CFLAGS) \
-isystem $(ROOT)/libc-artifacts/usr/include/c++/7.0.0 \
-isystem $(ROOT)/libc-artifacts/usr/include/c++/7.0.0/x86_64-elf-redox \
-isystem $(ROOT)/libc-artifacts/usr/include/c++/7.0.0/backward
# Kernel variables # Kernel variables
KTARGET=$(ARCH)-unknown-none KTARGET=$(ARCH)-unknown-none
@ -182,7 +178,6 @@ ifeq ($(ARCH),arm)
QEMUFLAGS+=-nographic QEMUFLAGS+=-nographic
export CC=$(ARCH)-none-eabi-gcc export CC=$(ARCH)-none-eabi-gcc
export CXX=$(ARCH)-none-eabi-g++
export LD=$(ARCH)-none-eabi-ld export LD=$(ARCH)-none-eabi-ld
KRUSTCFLAGS+=-C linker=$(CC) KRUSTCFLAGS+=-C linker=$(CC)
@ -222,7 +217,6 @@ else
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(UNAME),Darwin) ifeq ($(UNAME),Darwin)
export CC=$(ARCH)-elf-gcc export CC=$(ARCH)-elf-gcc
export CXX=$(ARCH)-elf-g++
ECHO=/bin/echo ECHO=/bin/echo
FUMOUNT=sudo umount FUMOUNT=sudo umount
export LD=$(ARCH)-elf-ld export LD=$(ARCH)-elf-ld
@ -231,7 +225,6 @@ else
VBM="/Applications/VirtualBox.app/Contents/MacOS/VBoxManage" VBM="/Applications/VirtualBox.app/Contents/MacOS/VBoxManage"
else else
export CC=gcc export CC=gcc
export CXX=g++
ECHO=echo ECHO=echo
FUMOUNT=fusermount -u FUMOUNT=fusermount -u
export LD=ld export LD=ld