status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-02-05 00:36:45 +00:00
Code Issues Projects Releases Wiki Activity

Windows: allow architecture override

Browse Source
This commit is contained in:
Ștefan Talpalaru 2019-02-16 06:01:05 +01:00 committed by zah
parent 50860e3817
commit e8d654ed0f
2 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.appveyor.yml
View File

@ -48,12 +48,12 @@ build_script:
- cd C:\projects\%APPVEYOR_PROJECT_SLUG% - cd C:\projects\%APPVEYOR_PROJECT_SLUG%
# speed up submodule cloning # speed up submodule cloning
- git submodule update --init --recursive --depth 10 - git submodule update --init --recursive --depth 10
- mingw32-make fetch-dlls - mingw32-make ARCH_OVERRIDE=%PLATFORM% fetch-dlls
- mingw32-make -j2 nimbus - mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% nimbus
test_script: test_script:
- build\nimbus.exe --help - build\nimbus.exe --help
- mingw32-make -j2 test - mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% test
deploy: off deploy: off

33
Makefile
View File

@ -32,9 +32,16 @@ NIM_DIR := vendor/Nim
#- Windows is a special case, as usual #- Windows is a special case, as usual
#- macOS is also a special case, with its "ln" not supporting "-r" #- macOS is also a special case, with its "ln" not supporting "-r"
ifeq ($(OS), Windows_NT) ifeq ($(OS), Windows_NT)
# the AppVeyor 32-build is done on a 64-bit image, so we need to override the architecture detection
ifeq ($(ARCH_OVERRIDE), x86)
UCPU := ucpu=i686
else
UCPU :=
endif
BUILD_CSOURCES := \ BUILD_CSOURCES := \
$(MAKE) myos=windows clean && \ $(MAKE) myos=windows $(UCPU) clean && \
$(MAKE) myos=windows CC=gcc LD=gcc $(MAKE) myos=windows $(UCPU) CC=gcc LD=gcc
EXE_SUFFIX := .exe EXE_SUFFIX := .exe
else else
BUILD_CSOURCES := \ BUILD_CSOURCES := \
@ -189,21 +196,31 @@ ifeq ($(OS), Windows_NT)
SQLITE_ARCHIVE_32 := sqlite-dll-win32-x86-3240000.zip SQLITE_ARCHIVE_32 := sqlite-dll-win32-x86-3240000.zip
SQLITE_ARCHIVE_64 := sqlite-dll-win64-x64-3240000.zip SQLITE_ARCHIVE_64 := sqlite-dll-win64-x64-3240000.zip
# the AppVeyor 32-build is done on a 64-bit image, so we need to override the architecture detection
ifeq ($(ARCH_OVERRIDE), x86)
ARCH := x86
else
ifeq ($(PROCESSOR_ARCHITEW6432), AMD64) ifeq ($(PROCESSOR_ARCHITEW6432), AMD64)
SQLITE_ARCHIVE := $(SQLITE_ARCHIVE_64) ARCH := x64
SQLITE_SUFFIX := _64
ROCKSDB_DIR := x64
else else
ifeq ($(PROCESSOR_ARCHITECTURE), AMD64) ifeq ($(PROCESSOR_ARCHITECTURE), AMD64)
SQLITE_ARCHIVE := $(SQLITE_ARCHIVE_64) ARCH := x64
SQLITE_SUFFIX := _64
ROCKSDB_DIR := x64
endif endif
ifeq ($(PROCESSOR_ARCHITECTURE), x86) ifeq ($(PROCESSOR_ARCHITECTURE), x86)
ARCH := x86
endif
endif
endif
ifeq ($(ARCH), x86)
SQLITE_ARCHIVE := $(SQLITE_ARCHIVE_32) SQLITE_ARCHIVE := $(SQLITE_ARCHIVE_32)
SQLITE_SUFFIX := _32 SQLITE_SUFFIX := _32
ROCKSDB_DIR := x86 ROCKSDB_DIR := x86
endif endif
ifeq ($(ARCH), x64)
SQLITE_ARCHIVE := $(SQLITE_ARCHIVE_64)
SQLITE_SUFFIX := _64
ROCKSDB_DIR := x64
endif endif
SQLITE_URL := https://www.sqlite.org/2018/$(SQLITE_ARCHIVE) SQLITE_URL := https://www.sqlite.org/2018/$(SQLITE_ARCHIVE)