Author: sebor
Date: Tue Sep 12 09:06:13 2006
New Revision: 442627
URL: http://svn.apache.org/viewvc?view=rev&rev=442627
Log:
2006-09-12 Martin Sebor <[EMAIL PROTECTED]>
* sunpro.config (CXXFLAGS.narrow, LDFLAGS.narrow, LDSOFLAGS.narrow):
Corrected.
(CXXFLAGS.* LDFLAGS.*, LDSOFLAGS.*): Handled AMD64.
Modified:
incubator/stdcxx/trunk/etc/config/sunpro.config
Modified: incubator/stdcxx/trunk/etc/config/sunpro.config
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/sunpro.config?view=diff&rev=442627&r1=442626&r2=442627
==============================================================================
--- incubator/stdcxx/trunk/etc/config/sunpro.config (original)
+++ incubator/stdcxx/trunk/etc/config/sunpro.config Tue Sep 12 09:06:13 2006
@@ -73,14 +73,30 @@
SINGL_CPPFLAGS =
SINGL_LDFLAGS =
-# wide (64-bit) flags -- must be set explicitly
-CXXFLAGS.wide = -xarch=v9
-LDFLAGS.wide = -xarch=v9
-LDSOFLAGS.wide = -xarch=v9
-ARFLAGS.wide =
+# (try to) determine the architecture via the (non-standard) -p option
+# recognized on (at least) Linux and Solaris
+arch=$(shell uname -p 2>/dev/null)
-# narrow (32-bit) flags
-CXXFLAGS.wide =
-LDFLAGS.wide =
-LDSOFLAGS.wide =
-ARFLAGS.wide =
+ifeq ($(arch),sparc)
+ # wide (64-bit) flags -- must be set explicitly
+ # narrow (32-bit) flags are implicit on SPARC
+ wide_flags = -xarch=v9
+ narrow_flags = -xarch=v8
+else
+ # wide (64-bit) flags -- must be set explicitly
+ # narrow (32-bit) flags are implicit on AMD64
+ if ($(arch),amd64)
+ wide_flags = -xarch=amd64
+ narrow_flags =
+ endif
+endif
+
+CXXFLAGS.wide = $(wide_flags)
+LDFLAGS.wide = $(wide_flags)
+LDSOFLAGS.wide = $(wide_flags)
+ARFLAGS.wide =
+
+CXXFLAGS.narrow = $(narrow_flags)
+LDFLAGS.narrow = $(narrow_flags)
+LDSOFLAGS.narrow = $(narrow_flags)
+ARFLAGS.narrow =
