summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtchang%redhat.com <devnull@localhost>2005-08-04 02:04:39 +0000
committerwtchang%redhat.com <devnull@localhost>2005-08-04 02:04:39 +0000
commit5546e2755ba77acd40b3dc126e343b1726fa0fc5 (patch)
tree01c99010a686d15d8163c9ad50449266c4f095e6
parenta1d3ae19d32b1f3ce88cbd230fd1d2a62610aa68 (diff)
downloadnspr-hg-5546e2755ba77acd40b3dc126e343b1726fa0fc5.tar.gz
Bugzilla Bug 303169: worked around a link error with gcc on Solaris SPARC
in debug builds. os_SunOS.s is only used by the _PR_GLOBAL_THREADS_ONLY configuration, so we don't use it in the default (pthreads) configuration. r=jpierre.
-rwxr-xr-xconfigure6
-rw-r--r--configure.in6
2 files changed, 8 insertions, 4 deletions
diff --git a/configure b/configure
index bdb5ff1a..9afeb583 100755
--- a/configure
+++ b/configure
@@ -5637,9 +5637,11 @@ EOF
PR_MD_ASFILES=os_SunOS_x86.s
fi
else
- PR_MD_ASFILES=os_SunOS.s
if test -n "$USE_64"; then
- PR_MD_ASFILES="$PR_MD_ASFILES os_SunOS_sparcv9.s"
+ PR_MD_ASFILES=os_SunOS_sparcv9.s
+ fi
+ if test -n "$USE_NATIVE_THREADS"; then
+ PR_MD_ASFILES="$PR_MD_ASFILES os_SunOS.s"
fi
fi
fi
diff --git a/configure.in b/configure.in
index a0a52264..b085ff5e 100644
--- a/configure.in
+++ b/configure.in
@@ -2493,9 +2493,11 @@ case "$target" in
PR_MD_ASFILES=os_SunOS_x86.s
fi
else
- PR_MD_ASFILES=os_SunOS.s
if test -n "$USE_64"; then
- PR_MD_ASFILES="$PR_MD_ASFILES os_SunOS_sparcv9.s"
+ PR_MD_ASFILES=os_SunOS_sparcv9.s
+ fi
+ if test -n "$USE_NATIVE_THREADS"; then
+ PR_MD_ASFILES="$PR_MD_ASFILES os_SunOS.s"
fi
fi
fi