mirror of
https://gitlab.com/sortix/sortix.git
synced 2023-02-13 20:55:38 -05:00
Sortix now defaults to build the same arch as the host machine.
This commit is contained in:
parent
de70b1804d
commit
84b93044c8
1 changed files with 12 additions and 7 deletions
19
Makefile
19
Makefile
|
@ -1,20 +1,25 @@
|
|||
BITS:=$(shell getconf LONG_BIT)
|
||||
ifndef CPU
|
||||
CPU=x86
|
||||
MFLAGS:=CPU=$(CPU)
|
||||
ifeq ($(BITS),64)
|
||||
CPU:=x64
|
||||
else
|
||||
CPU:=x86
|
||||
endif
|
||||
MFLAGS:=$(MFLAGS) CPU=$(CPU)
|
||||
endif
|
||||
|
||||
ifndef O
|
||||
O=-O2
|
||||
MFLAGS:=0=$(O)
|
||||
MFLAGS:=$(MFLAGS) 0=$(O)
|
||||
endif
|
||||
|
||||
ifeq ($(BENCH),1)
|
||||
EXTRAMODULES:=$(EXTRAMODULES) bench
|
||||
EXTRAMODULES:=$(EXTRAMODULES) bench
|
||||
endif
|
||||
|
||||
ifndef SYSROOT
|
||||
SYSROOT:=$(shell pwd)/sysroot
|
||||
MFLAGS:=SYSROOT=$(SYSROOT)
|
||||
MFLAGS:=$(MFLAGS) SYSROOT=$(SYSROOT)
|
||||
endif
|
||||
|
||||
REMOTE=192.168.2.6
|
||||
|
@ -56,9 +61,9 @@ everything: all deb iso
|
|||
|
||||
everything-all-archs:
|
||||
$(MAKE) clean $(MFLAGS)
|
||||
$(MAKE) everything CPU=x86 $(MFLAGS)
|
||||
$(MAKE) everything $(MFLAGS) CPU=x86
|
||||
$(MAKE) clean $(MFLAGS)
|
||||
$(MAKE) everything CPU=x64 $(MFLAGS)
|
||||
$(MAKE) everything $(MFLAGS) CPU=x64
|
||||
|
||||
# Initializing RamDisk
|
||||
$(INITRD): suball
|
||||
|
|
Loading…
Reference in a new issue