Changeset 576 for CMT/HEAD/mgr/Unix.make

Timestamp:

May 10, 2011, 2:39:10 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 458

File:

• CMT/HEAD/mgr/Unix.make (modified) (4 diffs)

CMT/HEAD/mgr/Unix.make

@@ -51 +51 @@
 endif
 
-ifeq ($(CMTBIN),Darwin)
+ifneq (,$(findstring Darwin,$(CMTBIN)))
 cpp       = c++ -O2
 endif
@@ -79 +79 @@
 ifneq (,$(findstring i386,$(CMTBIN)))
 _mode = 32
-else ifneq (,$(findstring i486,$(CMTBIN)))
+endif
+ifneq (,$(findstring i486,$(CMTBIN)))
 _mode = 32
-else ifneq (,$(findstring i586,$(CMTBIN)))
+endif
+ifneq (,$(findstring i586,$(CMTBIN)))
 _mode = 32
-else ifneq (,$(findstring i686,$(CMTBIN)))
+endif
+ifneq (,$(findstring i686,$(CMTBIN)))
 _mode = 32
-else ifneq (,$(findstring x86_64,$(CMTBIN)))
+endif
+ifneq (,$(findstring x86_64,$(CMTBIN)))
 _mode = 64
 endif
@@ -107 +111 @@
 ifeq ($(_mode),32)
     TARGET_ARCH = -m32
-else ifeq ($(_mode),64)
+endif
+ifeq ($(_mode),64)
     TARGET_ARCH = -m64
+endif
+endif
+
+#
+# Specify mode explicitly for Darwin
+# (on Mac OS X 10.6, uname -m may show i386
+# while c++ builds for x86_64 by default)
+#
+ifneq (,$(findstring Darwin,$(CMTBIN)))
+ifeq ($(_mode),32)
+    TARGET_ARCH = -arch i386
+endif
+ifeq ($(_mode),64)
+    TARGET_ARCH = -arch x86_64
 endif
 endif
@@ -139 +158 @@
 format_dependencies = $(CMTROOT)/mgr/cmt_format_deps.sh
 build_dependencies = :
-else ifneq (,$(findstring Darwin,$(CMTBIN)))
+endif
+ifneq (,$(findstring Darwin,$(CMTBIN)))
 cppdepflags = -MM
 format_dependencies = $(CMTROOT)/mgr/cmt_format_deps.sh