we shouldn't need this workaround now
authortridge <tridge@1e5ffdc8-eadd-0310-9daa-9cb4117fe24b>
Tue, 30 Mar 2010 04:03:27 +0000 (04:03 +0000)
committertridge <tridge@1e5ffdc8-eadd-0310-9daa-9cb4117fe24b>
Tue, 30 Mar 2010 04:03:27 +0000 (04:03 +0000)
git-svn-id: file:///home/svn/build-farm/trunk@947 1e5ffdc8-eadd-0310-9daa-9cb4117fe24b

SerNet-solaris8.fns

index e7098d4b30711569c4cc93e28251011742651f34..9bcb6a82e3e7b75f377cf3a14c6373a74425b161 100644 (file)
@@ -14,12 +14,7 @@ for compiler in cc ; do
 
        test_tree samba_4_0_test source $compiler
 
-       # this is a strange one. SerNet-solaris8 has two copies
-       # of iconv, one in /usr and the other in /usr/local
-       # it also has the python libs, but only in /usr/local
-       # we need to ensure it doesn't find python in /usr/local
-       # and iconv from /usr, otherwise the -I flags will conflict
-       CFLAGS="-I/usr/local/include" test_tree samba_4_0_waf source4 $compiler
+       test_tree samba_4_0_waf source4 $compiler
 
        test_tree samba_3_current source $compiler
        test_tree samba_3_next source $compiler