Author: mturk
Date: Sat Aug 8 15:21:37 2009
New Revision: 802390
URL: http://svn.apache.org/viewvc?rev=802390&view=rev
Log:
Use default platform compilers
Modified:
commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
commons/sandbox/runtime/trunk/src/main/native/configure
Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in?rev=802390&r1=802389&r2=802390&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Sat Aug 8
15:21:37 2009
@@ -139,7 +139,7 @@
@copy /Y $@ $(LIBSO)
$(SSLMODLIB): $(SHAREDLIB) $(OPENSSL_OBJS)
- $(RC) /l 0x409 /d "NDEBUG" /d SRC_INTNAME="$(SSLNAME)" /d
STR_PRODUCT="Apache Commons Runtime SSL Module" /d STR_INTNAME="$(SSLNAME)" /i
"$(SRCDIR)\include" /fo [email protected] $(SRCDIR)/os/win32/main.rc
+ $(RC) /l 0x409 /d "NDEBUG" /d STR_PRODUCT="Apache Commons Runtime SSL
Module" /d STR_INTNAME="$(SSLNAME)" /i "$(SRCDIR)\include" /fo [email protected]
$(SRCDIR)/os/win32/main.rc
$(LINK) $(SHFLAGS) $(LDFLAGS) $(SSLFLAGS) /DLL /SUBSYSTEM:WINDOWS
libpath:"." $(LIBNAME).lib /pdb:$(SSLNAME).pdb /out:$@ @<<
$(OPENSSL_OBJS) [email protected]
<<
Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=802390&r1=802389&r2=802390&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Sat Aug 8 15:21:37
2009
@@ -100,6 +100,8 @@
makefiles=Makefile
cc_ver_major=0
cc_ver_minor=0
+cc_set=no
+cxx_set=no
test=ctest$$
for o
@@ -153,10 +155,12 @@
;;
--with-cc=* )
cc="$a"
+ cc_set=yes
shift
;;
--with-cxx=* )
cxx="$a"
+ cxx_set=yes
shift
;;
--with-cpp=* )
@@ -345,18 +349,22 @@
hp-ux )
platform=HPUX
host=hpux
+ test ".$cc_set" = .no && cc=cc
;;
sunos )
platform=SOLARIS
host=solaris
+ test ".$cc_set" = .no && cc=cc
;;
cygwin* )
platform=WINDOWS
host=windows
+ test ".$cc_set" = .no && cc=cl
;;
mingw* )
platform=WINDOWS
host=windows
+ test ".$cc_set" = .no && cc=cl
;;
* )
platform=`toupper "$host"`
@@ -401,7 +409,7 @@
varadds ccflags -xstrconst -xdepend -O -Xa -KPIC
varadds ldflags -lpthread -ldl
varadds shflags -G -KPIC -dy
- cxx=CC
+ test ".$cxx_set" = .no && cxx=CC
cpp="cc -E"
as=cc
test ".$java_pinc" = . && java_pinc=linux
@@ -431,7 +439,7 @@
varadds ccflags -xstrconst -xdepend -O -Xa -KPIC
varadds ldflags -lrt -ldl -lthread -lsendfile -lsocket -lnsl
varadds shflags -G -KPIC -dy
- cxx=CC
+ test ".$cxx_set" = .no && cxx=CC
cpp="cc -E"
as=cc
test ".$java_pinc" = . && java_pinc=solaris
@@ -461,7 +469,7 @@
lib=.lib
obj=obj
makefiles=Makefile.msc
- cxx="$cc"
+ test ".$cxx_set" = .no && cxx=cl
cccinc=windows
link="`getmstool link`"
ar="`getmstool lib`"
