Changeset 560 for CMT/HEAD

Timestamp:

Sep 7, 2010, 1:19:15 PM (14 years ago)

Author:

rybkin

Message:

See C.L. 443

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/GNUmakefile (modified) (2 diffs)
• mgr/Unix.make (modified) (2 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2010-09-07    <rybkin@lal.in2p3.fr> 443
+
+        * mgr/Unix.make: Derive mode/architecture from CMTBIN or from command line
+        switch M32/M64 and specify it explicitly for g++
+        * mgr/GNUmakefile: Do not recreate cmt->cmt.exe symlink if exists
+        
 2010-09-04    <rybkin@lal.in2p3.fr> 442
 

CMT/HEAD/mgr/GNUmakefile

@@ -26 +26 @@
 ifneq ($(wildcard $(cmtexe)),)
 all :: cmt
-        $(silent)\cd $(bin) && \rm -f cmt && ln -s cmt.exe cmt
+        $(silent)\cd $(bin) && { [ -L cmt ] || [ $(notdir $(cmtexe)) = cmt ] || \ln -s $(notdir $(cmtexe)) cmt; }
+#       $(silent)\cd $(bin) && \rm -f cmt && ln -s cmt.exe cmt
         $(echo) all ok
 else
@@ -39 +40 @@
 all :: cmt post_build done
 endif
-        $(silent)\cd $(bin) && \rm -f cmt && ln -s cmt.exe cmt
+        $(silent)\cd $(bin) && { [ -L cmt ] || [ $(notdir $(cmtexe)) = cmt ] || \ln -s $(notdir $(cmtexe)) cmt; }
+#       $(silent)\cd $(bin) && \rm -f cmt && ln -s cmt.exe cmt
         $(echo) all ok
 #@cd $(bin); /bin/rm -f cmt; cp cmt.exe cmt

CMT/HEAD/mgr/Unix.make

@@ -9 +9 @@
 ifeq ($(STATIC),1)
     cpplinkflags   += -static
-endif
-
-ifeq ($(M32),1)
-    TARGET_ARCH = -m32
-endif
-ifeq ($(M64),1)
-    TARGET_ARCH = -m64
 endif
 
@@ -81 +74 @@
 endif
 
+#
+# Derive mode/architecture from CMTBIN
+#
+ifneq (,$(findstring i386,$(CMTBIN)))
+_mode = 32
+else ifneq (,$(findstring i486,$(CMTBIN)))
+_mode = 32
+else ifneq (,$(findstring i586,$(CMTBIN)))
+_mode = 32
+else ifneq (,$(findstring i686,$(CMTBIN)))
+_mode = 32
+else ifneq (,$(findstring x86_64,$(CMTBIN)))
+_mode = 64
+endif
+
+#
+# Use mode/architecture specified on command line explicitly
+#
+ifeq ($(M32),1)
+_mode = 32
+endif
+ifeq ($(M64),1)
+_mode = 64
+endif
+
+#
+# Specify mode explicitly for g++
+# (on Mac OS X 10.6, uname -m may show i386
+# while g++ builds for x86_64 by default)
+#
+ifneq (,$(findstring g++,$(cpp)))
+ifeq ($(_mode),32)
+    TARGET_ARCH = -m32
+else ifeq ($(_mode),64)
+    TARGET_ARCH = -m64
+endif
+endif
 
 src       = ../src/