[Fedora-directory-commits] dsbuild objdirname.mk,1.1.1.1,1.2

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/dsbuild
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27759/dsbuild

Modified Files:
	objdirname.mk 
Log Message:
Add support for x86_64



Index: objdirname.mk
===================================================================
RCS file: /cvs/dirsec/dsbuild/objdirname.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- objdirname.mk	10 Feb 2006 15:28:53 -0000	1.1.1.1
+++ objdirname.mk	15 Feb 2006 22:55:40 -0000	1.2
@@ -76,10 +76,16 @@
 PRETTY_ARCH     := Linux
 endif
 
+ifeq ($(USE_64), 1)
+  NS64TAG=_64
+endif
+
 NSOS_TEST1       := $(shell uname -m)
 ifeq ($(NSOS_ARCH),Linux)
-  ifeq (86,$(findstring 86,$(NSOS_TEST1)))
-    NSOS_TEST1    = x86
+  ifneq (x86_64, $(NSOS_TEST1))
+    ifeq (86,$(findstring 86,$(NSOS_TEST1)))
+      NSOS_TEST1    = x86
+    endif
   endif
 
   ifeq ($(USE_LIBC),1)
@@ -95,8 +101,10 @@
   NSCONFIG_NOTAG  = $(NSCONFIG)
 else
   ifeq ($(NSOS_ARCH),RHEL)
-    ifeq (86,$(findstring 86,$(NSOS_TEST1)))
-      NSOS_TEST1    = x86
+    ifneq (x86_64, $(NSOS_TEST1))
+      ifeq (86,$(findstring 86,$(NSOS_TEST1)))
+        NSOS_TEST1    = x86
+      endif
     endif
     NSCONFIG        = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION)
     NSCONFIG_NOTAG  = $(NSCONFIG)
@@ -119,6 +127,8 @@
       NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)
     endif
     endif
+    NSCONFIG += $(NS64TAG)
+    NSCONFIG_NOTAG += $(NS64TAG)
   endif
 endif
 
@@ -132,17 +142,17 @@
   OBJDIR_NAME     = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
   OBJDIR_NAME_32     = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
 else
-  OBJDIR_NAME     = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
-  OBJDIR_NAME_32  = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
-  OBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
+  OBJDIR_NAME     = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
+  OBJDIR_NAME_32  = $(subst $(NS64TAG),,$(OBJDIR_NAME))
+  OBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NSOBJDIR_TAG).OBJ
 endif
 
 # Mozilla uses a slightly different naming convention
 ifneq (,$(findstring RHEL3,$(OBJDIR_NAME)))
-  MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL3,Linux2.4,$(OBJDIR_NAME)))
+  MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(OBJDIR_NAME)))
 else
 ifneq (,$(findstring RHEL4,$(OBJDIR_NAME)))
-  MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL4,Linux2.6,$(OBJDIR_NAME)))
+  MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(OBJDIR_NAME)))
 else
   MOZ_OBJDIR_NAME = $(OBJDIR_NAME)
 endif