ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 13:38:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #483 from dicej/no-msys

Browse Source 
MSYS update, plan B
This commit is contained in:
Joshua Warner 2016-04-27 13:45:15 +00:00
commit c843d76f63
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
makefile
View File

@ -17,6 +17,7 @@ build-arch := $(shell uname -m \
build-platform := \ build-platform := \
$(shell uname -s | tr [:upper:] [:lower:] \ $(shell uname -s | tr [:upper:] [:lower:] \
| sed \ | sed \
-e 's/^mingw32.*$$/mingw32/' \
-e 's/^cygwin.*$$/cygwin/' \ -e 's/^cygwin.*$$/cygwin/' \
-e 's/^darwin.*$$/macosx/') -e 's/^darwin.*$$/macosx/')
@ -24,7 +25,7 @@ arch = $(build-arch)
target-arch = $(arch) target-arch = $(arch)
bootimage-platform = \ bootimage-platform = \
$(subst cygwin,windows,$(build-platform)) $(subst cygwin,windows,$(subst mingw32,windows,$(build-platform)))
platform = $(bootimage-platform) platform = $(bootimage-platform)
@ -148,7 +149,7 @@ windows-path = echo
path-separator = : path-separator = :
ifneq (,$(filter cygwin,$(build-platform))) ifneq (,$(filter mingw32 cygwin,$(build-platform)))
path-separator = ; path-separator = ;
endif endif
@ -415,6 +416,14 @@ endif
input = List input = List
ifeq ($(use-clang),true)
build-cxx = clang++ -std=c++11
build-cc = clang
else
build-cxx = g++
build-cc = gcc
endif
mflag = mflag =
ifneq ($(kernel),darwin) ifneq ($(kernel),darwin)
ifeq ($(arch),i386) ifeq ($(arch),i386)
@ -425,18 +434,10 @@ ifneq ($(kernel),darwin)
endif endif
endif endif
ifeq ($(use-clang),true)
build-cxx = clang++ -std=c++11
build-cc = clang
else
build-cxx = g++ $(mflag)
build-cc = gcc $(mflag)
endif
target-format = elf target-format = elf
cxx = $(build-cxx) cxx = $(build-cxx) $(mflag)
cc = $(build-cc) cc = $(build-cc) $(mflag)
ar = ar ar = ar
ranlib = ranlib ranlib = ranlib
@ -682,15 +683,15 @@ ifeq ($(platform),android)
build-cflags = $(common-cflags) -I$(src) build-cflags = $(common-cflags) -I$(src)
build-lflags = -lz -lpthread build-lflags = -lz -lpthread
ifeq ($(subst cygwin,windows,$(build-platform)),windows) ifeq ($(subst cygwin,windows,$(subst mingw32,windows,$(build-platform))),windows)
toolchain-host-platform = $(subst cygwin,windows,$(build-platform)) toolchain-host-platform = $(subst cygwin,windows,$(subst mingw32,windows,$(build-platform)))
build-system = windows build-system = windows
build-cxx = i686-w64-mingw32-g++ build-cxx = i686-w64-mingw32-g++
build-cc = i686-w64-mingw32-gcc build-cc = i686-w64-mingw32-gcc
sysroot = "$$(cygpath -w "$(ndk)/platforms/android-$(android-version)/arch-arm")" sysroot = "$$(cygpath -w "$(ndk)/platforms/android-$(android-version)/arch-arm")"
build-cflags += "-I$(JAVA_HOME)/include/win32" build-cflags += "-I$(JAVA_HOME)/include/win32"
else else
toolchain-host-platform = $(subst cygwin,windows,$(build-platform))-* toolchain-host-platform = $(subst cygwin,windows,$(subst mingw32,windows,$(build-platform)))-*
sysroot = $(ndk)/platforms/android-$(android-version)/arch-arm sysroot = $(ndk)/platforms/android-$(android-version)/arch-arm
build-cflags += "-I$(JAVA_HOME)/include/linux" build-cflags += "-I$(JAVA_HOME)/include/linux"
build-lflags += -ldl build-lflags += -ldl
@ -918,7 +919,7 @@ ifeq ($(platform),windows)
cflags = -I$(inc) $(common-cflags) -DWINVER=0x0500 -U__STRICT_ANSI__ cflags = -I$(inc) $(common-cflags) -DWINVER=0x0500 -U__STRICT_ANSI__
ifeq (,$(filter cygwin,$(build-platform))) ifeq (,$(filter mingw32 cygwin,$(build-platform)))
openjdk-extra-cflags += -I$(src)/openjdk/caseSensitive openjdk-extra-cflags += -I$(src)/openjdk/caseSensitive
prefix := $(shell i686-w64-mingw32-gcc --version >/dev/null 2>&1 \ prefix := $(shell i686-w64-mingw32-gcc --version >/dev/null 2>&1 \
&& echo i686-w64-mingw32- || echo x86_64-w64-mingw32-) && echo i686-w64-mingw32- || echo x86_64-w64-mingw32-)