diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-08-25 07:02:49 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-08-25 07:02:49 +0000 |
| commit | 333b9e1643642181c4d78ad3f2ec45a05f81809f (patch) | |
| tree | 0483ae65a3616e9e1f0d86b9a9382be459445401 /include | |
| parent | ebcd82ac8f122ef7389f7fd7158b114c7fd641d9 (diff) | |
| download | ATCD-333b9e1643642181c4d78ad3f2ec45a05f81809f.tar.gz | |
ChangeLogTag: Wed Aug 25 07:02:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'include')
| -rw-r--r-- | include/makeinclude/platform_hpux_aCC.GNU | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU index 2864f5f76ca..281a04fb9ea 100644 --- a/include/makeinclude/platform_hpux_aCC.GNU +++ b/include/makeinclude/platform_hpux_aCC.GNU @@ -39,6 +39,7 @@ endif # First, extract the OS version number. HPVERS_WORDS := $(subst ., ,$(shell uname -r)) +HPMODEL := $(shell uname -m)) HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS))) # CC = /bin/cc @@ -49,11 +50,12 @@ ifeq (,$(stdcpplib)) # can do -AA, unless it's a .2x version (e.g., 03.24). 03.27 can do -AA, # so check for that one explicitly and enable it if so. CXXVERS_WORDS := $(subst ., , $(shell $(CXX) -V 2>&1)) - CXXVERS := $(word 8, $(CXXVERS_WORDS)) - ifeq (,$(filter 2%,$(CXXVERS))) + CXXMINORVERS := $(word 8, $(CXXVERS_WORDS)) + CXXMAJORVERS := $(word 7, $(CXXVERS_WORDS)) + ifeq (,$(filter 2%,$(CXXMINORVERS))) stdcpplib = 1 else - ifeq (27,$(CXXVERS)) + ifeq (27,$(CXXMINORVERS)) stdcpplib = 1 else stdcpplib = 0 @@ -97,7 +99,7 @@ else endif endif -ifeq ($(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS))), 1123) +ifeq ($(HPMODEL), ia64) itanium = 1 endif |