Author: nextgens
Date: 2006-01-31 16:58:46 +0000 (Tue, 31 Jan 2006)
New Revision: 7971
Modified:
trunk/contrib/NativeBigInteger/jbigi/src/jbigi.c
trunk/contrib/jcpuid/build.sh
Log:
We will get rid of JCPUID for x64
Modified: trunk/contrib/NativeBigInteger/jbigi/src/jbigi.c
===================================================================
(Binary files differ)
Modified: trunk/contrib/jcpuid/build.sh
===================================================================
--- trunk/contrib/jcpuid/build.sh 2006-01-31 13:17:21 UTC (rev 7970)
+++ trunk/contrib/jcpuid/build.sh 2006-01-31 16:58:46 UTC (rev 7971)
@@ -23,14 +23,16 @@
# platform-independent variables
SRC="src/jcpuid.cpp"
OBJDIR="lib/freenet/support/CPUInformation"
-CXXFLAGS="-shared -static-libgcc -fPIC"
+CXXFLAGS="-shared -static -static -libgcc"
# determine the operating system and machine type
OS="$(uname -s|tr "[A-Z]" "[a-z]")" # convert any uppercase to lowercase
ARCH=$(uname -m)
-# amd64 machine type requires an additional compiler flag to build successfully
-[ "${ARCH}" = "x86_64" ] && CXXFLAGS="-shared -static-libgcc -fPIC"
+# amd64 machine type requires an additional compiler flag to build
+# successfully it won't works as -shared and -static are curently
+# incompatible
+[ "${ARCH}" = "x86_64" ] && CXXFLAGS="-shared -static -static-libgcc -fPIC"
# OK, now we can generate our object file's name and the proper include paths
OBJ="libjcpuid-x86-${OS}.so"