summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authormaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-21 19:58:21 +0000
committermaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-21 19:58:21 +0000
commit54f0a3085bd788bf1dd3ec717e17d2385d5da7dc (patch)
tree1337fa5da5ed584d662f9ad8ec63463c88e26f5a /webkit
parent37586046531d9ad3fe4ade5b9d5b8f27bf76544f (diff)
downloadchromium_src-54f0a3085bd788bf1dd3ec717e17d2385d5da7dc.zip
chromium_src-54f0a3085bd788bf1dd3ec717e17d2385d5da7dc.tar.gz
chromium_src-54f0a3085bd788bf1dd3ec717e17d2385d5da7dc.tar.bz2
Fix a build idiocraty with NTFS and Vista in particular. Cygwin tries to be a bit too clever about the files' DACL.
By setting NoNtSec, this posix emulation is disabled. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/build/JavaScriptCore/JavaScriptCore_pcre.vcproj4
-rw-r--r--webkit/build/JavaScriptCore/prebuild.bat7
2 files changed, 10 insertions, 1 deletions
diff --git a/webkit/build/JavaScriptCore/JavaScriptCore_pcre.vcproj b/webkit/build/JavaScriptCore/JavaScriptCore_pcre.vcproj
index 1092f16..f682430 100644
--- a/webkit/build/JavaScriptCore/JavaScriptCore_pcre.vcproj
+++ b/webkit/build/JavaScriptCore/JavaScriptCore_pcre.vcproj
@@ -122,6 +122,10 @@
</References>
<Files>
<File
+ RelativePath=".\copy_files.bat"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\pcre\pcre.h"
>
</File>
diff --git a/webkit/build/JavaScriptCore/prebuild.bat b/webkit/build/JavaScriptCore/prebuild.bat
index f17f7dd..fd7b878 100644
--- a/webkit/build/JavaScriptCore/prebuild.bat
+++ b/webkit/build/JavaScriptCore/prebuild.bat
@@ -11,6 +11,9 @@ set PATH=%CYGWIN_ROOT%bin;%GNU_ROOT%;%SystemRoot%;%SystemRoot%\system32
:: Ensure that the cygwin mount points are defined
CALL %CYGWIN_ROOT%setup_mount.bat > NUL
+:: Fix tempfile() on vista: without this flag, the files that it creates are not accessible.
+set CYGWIN=nontsec
+
:: Help dftables script to find a usable temporary directory. For an unknown
:: reason, /tmp is not defined on cygwin and this script looks at TMPDIR
:: environment variable, which is usually not defined on Windows either.
@@ -24,4 +27,6 @@ if "%TMPDIR%" == "" (
) else (
bash build-generated-files.sh "%IntDir%" "..\..\..\third_party\WebKit"
)
-copy_files.bat %IntDir%\JavaScriptCore
+
+call copy_files.bat %IntDir%\JavaScriptCore
+endlocal