Mercurial > hg > truffle

comparison make/defs.make @ 3967:da883b9e6d37 hs23-b01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author jcoomes
date Fri, 30 Sep 2011 18:27:39 -0700
parents f08d439fab8c
children 436b4a3231bf
comparison
equal deleted inserted replaced
3952:0663e7617095 3967:da883b9e6d37
116 endif 116 endif
117 117
118 # Windows should have OS predefined 118 # Windows should have OS predefined
119 ifeq ($(OS),) 119 ifeq ($(OS),)
120 OS := $(shell uname -s) 120 OS := $(shell uname -s)
121 ifneq ($(findstring BSD,$(OS)),)
122 OS=bsd
123 endif
124 ifeq ($(OS), Darwin)
125 OS=bsd
126 endif
121 HOST := $(shell uname -n) 127 HOST := $(shell uname -n)
122 endif 128 endif
123 129
124 # If not SunOS and not Linux, assume Windows 130 # If not SunOS, not Linux and not BSD, assume Windows
125 ifneq ($(OS), Linux) 131 ifneq ($(OS), Linux)
126 ifneq ($(OS), SunOS) 132 ifneq ($(OS), SunOS)
127 OSNAME=windows 133 ifneq ($(OS), bsd)
134 OSNAME=windows
135 else
136 OSNAME=bsd
137 endif
128 else 138 else
129 OSNAME=solaris 139 OSNAME=solaris
130 endif 140 endif
131 else 141 else
132 OSNAME=linux 142 OSNAME=linux