Skip to content

Commit

Permalink
improve PORT to include OS/version
Browse files Browse the repository at this point in the history
  • Loading branch information
lperron committed Jun 17, 2016
1 parent 17cc118 commit 988850e
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions makefiles/Makefile.port
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@ ifeq ("$(SYSTEM)","unix")
PLATFORM = LINUX
CODEPORT = OpSys-Linux
LBITS = $(shell getconf LONG_BIT)
DISTRIBUTION_ID = $(shell lsb_release -i -s)
DISTRIBUTION_NUMBER = $(shell lsb_release -r -s)
DISTRIBUTION = $(DISTRIBUTION_ID)-$(DISTRIBUTION_NUMBER)
ifeq ($(LBITS),64)
NETPLATFORM = anycpu
PORT = Linux64
PORT = $(DISTRIBUTION)-64bit
PTRLENGTH = 64
GUROBI_PLATFORM=linux64
CANDIDATE_JDK_ROOTS = \
Expand All @@ -41,7 +44,7 @@ ifeq ("$(SYSTEM)","unix")
/usr/lib/jvm/java-9-openjdk-amd64
else
NETPLATFORM = x86
PORT = Linux32
PORT = $(DISTRIBUTION)-32bit
PTRLENGTH = 32
GUROBI_PLATFORM=linux32
CANDIDATE_JDK_ROOTS = \
Expand All @@ -58,7 +61,8 @@ ifeq ("$(SYSTEM)","unix")
endif
ifeq ($(OS),Darwin) # Assume Mac Os X
PLATFORM = MACOSX
PORT = MacOsX64
OS_VERSION = $(shell sw_vers -productVersion)
PORT = MacOsX-$(OS_VERSION)
CODEPORT = OpSys-OSX
NETPLATFORM = x64
PTRLENGTH = 64
Expand Down

0 comments on commit 988850e

Please sign in to comment.