diff options
| author | Nathan Kinder <nkinder@redhat.com> | 2005-03-11 21:33:05 +0000 |
|---|---|---|
| committer | Nathan Kinder <nkinder@redhat.com> | 2005-03-11 21:33:05 +0000 |
| commit | 44bc78939bed4a55db2bab87d9ed817a79d1260b (patch) | |
| tree | 4939464259a55e8dfd9356629ef7a9ad67842179 /nsconfig.mk | |
| parent | 385a06685da620c0753ef6daf187f4eb2d5f7517 (diff) | |
| download | ds-44bc78939bed4a55db2bab87d9ed817a79d1260b.tar.gz ds-44bc78939bed4a55db2bab87d9ed817a79d1260b.tar.xz ds-44bc78939bed4a55db2bab87d9ed817a79d1260b.zip | |
Use new RHEL platform naming
Diffstat (limited to 'nsconfig.mk')
| -rw-r--r-- | nsconfig.mk | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/nsconfig.mk b/nsconfig.mk index 294a9984..2afe1cb9 100644 --- a/nsconfig.mk +++ b/nsconfig.mk @@ -58,6 +58,24 @@ endif NSOS_RELEASE := $(shell uname -r) NSOS_RELEASE_NOTAG = $(NSOS_RELEASE) +# Check if we're on RHEL +ifeq ($(NSOS_ARCH), Linux) + NSOS_TEST := $(shell cat /etc/redhat-release) + ifeq ($(findstring Taroon, $(NSOS_TEST)),Taroon) + NSOS_ARCH := RHEL + NSOS_RELEASE := 3 + # Always use gcc on RHEL + GCC_VERSION := gcc$(word 1, $(shell gcc --version | sed 's/gcc.*GCC.\s//' | sed 's/\..*//')) + else + ifeq ( $(findstring Nahant, $(NSOS_TEST)),Nahant) + NSOS_ARCH := RHEL + NSOS_RELEASE := 4 + # Always use gcc on RHEL + GCC_VERSION := gcc$(word 1, $(shell gcc --version | sed 's/gcc.*GCC.\s//' | sed 's/\..*//')) + endif + endif +endif + ifeq ($(NSOS_ARCH), AIX) NSOS_TEST := $(shell uname -v) ifeq ($(NSOS_TEST),3) @@ -206,12 +224,20 @@ ifeq ($(NSOS_ARCH),Linux) NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(LIBC_VERSION)$(PTHREAD_TAG) NSCONFIG_NOTAG = $(NSCONFIG) else - ifeq ($(NSOS_TEST1),i86pc) - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1) - NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1) + ifeq ($(NSOS_ARCH),RHEL) + ifeq (86,$(findstring 86,$(NSOS_TEST1))) + NSOS_TEST1 = x86 + endif + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION) + NSCONFIG_NOTAG = $(NSCONFIG) else - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE) - NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG) + ifeq ($(NSOS_TEST1),i86pc) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1) + else + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG) + endif endif endif @@ -547,6 +573,7 @@ LINK_DLL=$(CCC) $(DLL_LDFLAGS) -o $@ PEER_ARCH=irix export NO_DB2=1 + else ifeq ($(ARCH), Linux) OSVERSION := $(basename $(shell uname -r)) |