summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>1999-07-21 16:35:59 +0000
committerSteve Huston <shuston@riverace.com>1999-07-21 16:35:59 +0000
commitb5c5ca44fc49d16709ed80a0e2978c747be3458f (patch)
tree89a171ae6b463a77d1d906f9df298ea929779730 /include
parenta1130c766160728473575c3bca2600616fc0522a (diff)
downloadATCD-b5c5ca44fc49d16709ed80a0e2978c747be3458f.tar.gz
Replaced direct set of variables with check to see if user has already set them.
Add -bbigtoc for TAO_IDL w/ egcs on AIX.
Diffstat (limited to 'include')
-rw-r--r--include/makeinclude/platform_aix4_cset++.GNU10
-rw-r--r--include/makeinclude/platform_aix4_g++.GNU23
-rw-r--r--include/makeinclude/platform_hpux_aCC.GNU19
3 files changed, 43 insertions, 9 deletions
diff --git a/include/makeinclude/platform_aix4_cset++.GNU b/include/makeinclude/platform_aix4_cset++.GNU
index 93adfa4c3c6..09a29b05657 100644
--- a/include/makeinclude/platform_aix4_cset++.GNU
+++ b/include/makeinclude/platform_aix4_cset++.GNU
@@ -16,7 +16,15 @@
# ftp://service.boulder.ibm.com/aix/fixes/v4/os/bos.rte.bind_cmds.4.2.0.4.bff
# or a successor.
-debug = 1
+ifeq (,$(debug))
+ debug = 1
+endif
+ifeq (,$(distrib))
+ distrib = 0
+endif
+ifeq (,$(optimize))
+ optimize = 0
+endif
# In case anything here or in the config depends on OS version number,
# grab it here and pass it all to the compiler as well.
diff --git a/include/makeinclude/platform_aix4_g++.GNU b/include/makeinclude/platform_aix4_g++.GNU
index 69793ceb341..9da6ad1d96e 100644
--- a/include/makeinclude/platform_aix4_g++.GNU
+++ b/include/makeinclude/platform_aix4_g++.GNU
@@ -6,9 +6,19 @@
# Original contributed by Ian Wright <I.Wright@elsevier.co.uk>. Updated for
# AIX 4 and egcs by Steve Huston <shuston@riverace.com>.
-debug = 1
-optimize = 0
-threads = 1
+
+ifeq (,$(debug))
+ debug = 1
+endif
+ifeq (,$(distrib))
+ distrib = 0
+endif
+ifeq (,$(optimize))
+ optimize = 0
+endif
+ifeq (,$(threads))
+ threads = 1
+endif
# In case anything here or in the config depends on OS version number,
# grab it here and pass it all to the compiler as well.
@@ -25,7 +35,12 @@ CCFLAGS += $(CFLAGS) -fno-implicit-templates
DCFLAGS += -g
DLD = $(CXX)
LD = $(CXX)
-LDFLAGS += -Wl,-bI:/lib/pse.exp
+LDFLAGS += -Wl,-bI:/lib/pse.exp
+# Linking TAO_IDL runs out of TOC space unless -bbigtoc is given to ld.
+# Don't do it for everything because it decreases run-time performance.
+ifeq ($(notdir $(shell pwd)), TAO_IDL)
+LDFLAGS += -Wl,-bbigtoc
+endif
OCFLAGS = -O2
OCCFLAGS = $(OCFLAGS)
ifeq ($(threads),1)
diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU
index 19ec2f07488..3814a3e074d 100644
--- a/include/makeinclude/platform_hpux_aCC.GNU
+++ b/include/makeinclude/platform_hpux_aCC.GNU
@@ -15,10 +15,21 @@
# -Wl,+vnocompatwarnings is added to shut up the "At least one PA 2.0 object
# file detected..." messages.
-buildbits = 0
-debug = 1
-distrib = 0
-threads = 1
+ifeq (,$(buildbits))
+ buildbits = 0
+endif
+ifeq (,$(debug))
+ debug = 1
+endif
+ifeq (,$(distrib))
+ distrib = 0
+endif
+ifeq (,$(optimize))
+ optimize = 0
+endif
+ifeq (,$(threads))
+ threads = 1
+endif
# First, extract the OS version number.
HPVERS_WORDS := $(subst ., ,$(shell uname -r))