summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorelliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-07-11 23:10:30 +0000
committerelliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-07-11 23:10:30 +0000
commit46b074c075586ba3f2e939ab8355d4bf9e709b35 (patch)
treee0810bf68d977c5ea249d5b558f83e11bded19d5 /include
parent6027d7b20c2c14bf2c2b8cdb1b4e4a64bdb2185e (diff)
downloadATCD-46b074c075586ba3f2e939ab8355d4bf9e709b35.tar.gz
ChangeLogTag: Tue Jul 11 23:09:28 UTC 2006 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'include')
-rw-r--r--include/makeinclude/platform_hpux_aCC.GNU7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU
index 08c0deaa13c..a61ccbde6ca 100644
--- a/include/makeinclude/platform_hpux_aCC.GNU
+++ b/include/makeinclude/platform_hpux_aCC.GNU
@@ -77,7 +77,7 @@ ifeq ($(threads),1)
# set the defs by hand; anything else, use -mt. This leaves out .1x
# versions, which should be no problem at this point.
ifeq (,$(filter 2%,$(CXXMINORVERS)))
- THR_DEFS += -mt
+ CC_THR_DEFS += -mt
else
# Different for v2 vs. v1 C++ library selection.
ifeq (1,$(stdcpplib))
@@ -127,6 +127,7 @@ ifeq (05,$(CXXMAJORVERS))
endif
CPPFLAGS += $(THR_DEFS) -D_HPUX_SOURCE -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE
+CCFLAGS += $(CC_THR_DEFS)
# If exception support is explicitly disabled, tell the compiler.
# This is not recommended since the run-time library can throw exceptions.
@@ -213,8 +214,8 @@ ifeq ($(word 2,$(HPVERS_WORDS)), 11)
#11.x:
ifeq ($(threads),1)
- # If -mt is in CPPLAGS, we don't need to add anything to LIBS; -mt does it.
- ifeq ($(findstring -mt,$(CPPFLAGS)),)
+ # If -mt is in CCFLAGS, we don't need to add anything to LIBS; -mt does it.
+ ifeq ($(findstring -mt,$(CCFLAGS)),)
## -L./ must directly preceed the system libraries for 64-bit builds
## with aCC 3.27. Without this change, libpthread.sl can not be found.
LIBS += -L./ -lpthread