Merge pull request #20 from antanst/fix-uname

Use portable uname flag, handle OpenBSD case of amd64
This commit is contained in:
tevador 2019-02-11 16:00:17 +01:00 committed by GitHub
commit 49581e503a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,8 +1,11 @@
#CXX=g++-8 #CXX=g++-8
#CC=gcc-8 #CC=gcc-8
PLATFORM=$(shell uname -i) PLATFORM=$(shell uname -m)
CXXFLAGS=-std=c++11 CXXFLAGS=-std=c++11
CCFLAGS= CCFLAGS=
ifeq ($(PLATFORM),amd64)
CXXFLAGS += -maes
endif
ifeq ($(PLATFORM),x86_64) ifeq ($(PLATFORM),x86_64)
CXXFLAGS += -maes CXXFLAGS += -maes
endif endif
@ -12,6 +15,9 @@ OBJDIR=obj
LDFLAGS=-lpthread LDFLAGS=-lpthread
TOBJS=$(addprefix $(OBJDIR)/,instructionsPortable.o TestAluFpu.o) TOBJS=$(addprefix $(OBJDIR)/,instructionsPortable.o TestAluFpu.o)
ROBJS=$(addprefix $(OBJDIR)/,argon2_core.o argon2_ref.o AssemblyGeneratorX86.o blake2b.o CompiledVirtualMachine.o dataset.o JitCompilerX86.o instructionsPortable.o Instruction.o InterpretedVirtualMachine.o main.o Program.o softAes.o VirtualMachine.o Cache.o virtualMemory.o divideByConstantCodegen.o LightClientAsyncWorker.o hashAes1Rx4.o) ROBJS=$(addprefix $(OBJDIR)/,argon2_core.o argon2_ref.o AssemblyGeneratorX86.o blake2b.o CompiledVirtualMachine.o dataset.o JitCompilerX86.o instructionsPortable.o Instruction.o InterpretedVirtualMachine.o main.o Program.o softAes.o VirtualMachine.o Cache.o virtualMemory.o divideByConstantCodegen.o LightClientAsyncWorker.o hashAes1Rx4.o)
ifeq ($(PLATFORM),amd64)
ROBJS += $(OBJDIR)/JitCompilerX86-static.o $(OBJDIR)/squareHash.o
endif
ifeq ($(PLATFORM),x86_64) ifeq ($(PLATFORM),x86_64)
ROBJS += $(OBJDIR)/JitCompilerX86-static.o $(OBJDIR)/squareHash.o ROBJS += $(OBJDIR)/JitCompilerX86-static.o $(OBJDIR)/squareHash.o
endif endif