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 #484 from bigfatbrowncat/msys2-support

Browse Source 
Added support for MSYS2 with mingw-w64 toolchain
This commit is contained in:
Joel Dice 2016-04-28 09:16:36 -06:00
commit edbce08e61
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makefile
View File

@ -3,7 +3,7 @@ MAKEFLAGS = -s
name = avian name = avian
version := $(shell grep version gradle.properties | cut -d'=' -f2) version := $(shell grep version gradle.properties | cut -d'=' -f2)
java-version := $(shell $(JAVA_HOME)/bin/java -version 2>&1 \ java-version := $(shell "$(JAVA_HOME)/bin/java" -version 2>&1 \
| head -n 1 \ | head -n 1 \
| sed 's/.*version "1.\([^.]*\).*/\1/') | sed 's/.*version "1.\([^.]*\).*/\1/')
@ -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/^mingw64.*$$/mingw32/' \
-e 's/^mingw32.*$$/mingw32/' \ -e 's/^mingw32.*$$/mingw32/' \
-e 's/^cygwin.*$$/cygwin/' \ -e 's/^cygwin.*$$/cygwin/' \
-e 's/^darwin.*$$/macosx/') -e 's/^darwin.*$$/macosx/')