- Timestamp:
- Sep 7, 2010, 1:19:15 PM (14 years ago)
- Location:
- CMT/HEAD
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/ChangeLog
r559 r560 1 2010-09-07 <rybkin@lal.in2p3.fr> 443 2 3 * mgr/Unix.make: Derive mode/architecture from CMTBIN or from command line 4 switch M32/M64 and specify it explicitly for g++ 5 * mgr/GNUmakefile: Do not recreate cmt->cmt.exe symlink if exists 6 1 7 2010-09-04 <rybkin@lal.in2p3.fr> 442 2 8 -
CMT/HEAD/mgr/GNUmakefile
r559 r560 26 26 ifneq ($(wildcard $(cmtexe)),) 27 27 all :: cmt 28 $(silent)\cd $(bin) && \rm -f cmt && ln -s cmt.exe cmt 28 $(silent)\cd $(bin) && { [ -L cmt ] || [ $(notdir $(cmtexe)) = cmt ] || \ln -s $(notdir $(cmtexe)) cmt; } 29 # $(silent)\cd $(bin) && \rm -f cmt && ln -s cmt.exe cmt 29 30 $(echo) all ok 30 31 else … … 39 40 all :: cmt post_build done 40 41 endif 41 $(silent)\cd $(bin) && \rm -f cmt && ln -s cmt.exe cmt 42 $(silent)\cd $(bin) && { [ -L cmt ] || [ $(notdir $(cmtexe)) = cmt ] || \ln -s $(notdir $(cmtexe)) cmt; } 43 # $(silent)\cd $(bin) && \rm -f cmt && ln -s cmt.exe cmt 42 44 $(echo) all ok 43 45 #@cd $(bin); /bin/rm -f cmt; cp cmt.exe cmt -
CMT/HEAD/mgr/Unix.make
r559 r560 9 9 ifeq ($(STATIC),1) 10 10 cpplinkflags += -static 11 endif12 13 ifeq ($(M32),1)14 TARGET_ARCH = -m3215 endif16 ifeq ($(M64),1)17 TARGET_ARCH = -m6418 11 endif 19 12 … … 81 74 endif 82 75 76 # 77 # Derive mode/architecture from CMTBIN 78 # 79 ifneq (,$(findstring i386,$(CMTBIN))) 80 _mode = 32 81 else ifneq (,$(findstring i486,$(CMTBIN))) 82 _mode = 32 83 else ifneq (,$(findstring i586,$(CMTBIN))) 84 _mode = 32 85 else ifneq (,$(findstring i686,$(CMTBIN))) 86 _mode = 32 87 else ifneq (,$(findstring x86_64,$(CMTBIN))) 88 _mode = 64 89 endif 90 91 # 92 # Use mode/architecture specified on command line explicitly 93 # 94 ifeq ($(M32),1) 95 _mode = 32 96 endif 97 ifeq ($(M64),1) 98 _mode = 64 99 endif 100 101 # 102 # Specify mode explicitly for g++ 103 # (on Mac OS X 10.6, uname -m may show i386 104 # while g++ builds for x86_64 by default) 105 # 106 ifneq (,$(findstring g++,$(cpp))) 107 ifeq ($(_mode),32) 108 TARGET_ARCH = -m32 109 else ifeq ($(_mode),64) 110 TARGET_ARCH = -m64 111 endif 112 endif 83 113 84 114 src = ../src/
Note: See TracChangeset
for help on using the changeset viewer.