diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-05 05:34:18 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-05 05:34:18 +0000 |
| commit | 25a58ce0a6d6b6f08da9da374074463662175285 (patch) | |
| tree | 31b958955432f7a64a2e101284fc586109368670 /native_client_sdk | |
| parent | 2ec536f55c8557f2db683b5f7b5914b0a57f29ac (diff) | |
| download | chromium_src-25a58ce0a6d6b6f08da9da374074463662175285.zip chromium_src-25a58ce0a6d6b6f08da9da374074463662175285.tar.gz chromium_src-25a58ce0a6d6b6f08da9da374074463662175285.tar.bz2 | |
[NaCl SDK] Fix build failure on Windows introduced in r160293.
nacl_mounts_test uses pthreads, which on Windows uses the pthreads_win32
library. Because we use the static version of this library, PTW32_STATIC_LIB
needs to be defined when compiling any file that uses pthreads or it will
attempt to use the DLL symbols instead.
BUG=none
TBR=noelallen@chromium.org
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11028053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/make_rules.py | 2 | ||||
| -rw-r--r-- | native_client_sdk/src/examples/pi_generator/example.dsc | 1 | ||||
| -rw-r--r-- | native_client_sdk/src/libraries/pthread/library.dsc | 3 |
3 files changed, 1 insertions, 5 deletions
diff --git a/native_client_sdk/src/build_tools/make_rules.py b/native_client_sdk/src/build_tools/make_rules.py index 02752dc..9b2a947 100755 --- a/native_client_sdk/src/build_tools/make_rules.py +++ b/native_client_sdk/src/build_tools/make_rules.py @@ -57,7 +57,7 @@ WIN_CC?=cl.exe /nologo WIN_CXX?=cl.exe /nologo WIN_LINK?=link.exe /nologo WIN_LIB?=lib.exe /nologo -WIN_CCFLAGS=/I$(NACL_SDK_ROOT)/include /I$(NACL_SDK_ROOT)/include/win -D WIN32 -D _WIN32 +WIN_CCFLAGS=/I$(NACL_SDK_ROOT)/include /I$(NACL_SDK_ROOT)/include/win -D WIN32 -D _WIN32 -D PTW32_STATIC_LIB """ # diff --git a/native_client_sdk/src/examples/pi_generator/example.dsc b/native_client_sdk/src/examples/pi_generator/example.dsc index 9e177e0..926cb59 100644 --- a/native_client_sdk/src/examples/pi_generator/example.dsc +++ b/native_client_sdk/src/examples/pi_generator/example.dsc @@ -9,7 +9,6 @@ 'pi_generator.h', 'pi_generator_module.cc' ], - 'DEFINES': ['PTW32_STATIC_LIB'], 'LIBS': ['ppapi_cpp', 'ppapi', 'pthread'] } ], diff --git a/native_client_sdk/src/libraries/pthread/library.dsc b/native_client_sdk/src/libraries/pthread/library.dsc index e4838a52..9d8cd1c 100644 --- a/native_client_sdk/src/libraries/pthread/library.dsc +++ b/native_client_sdk/src/libraries/pthread/library.dsc @@ -7,9 +7,6 @@ { 'NAME' : 'pthread', 'TYPE' : 'lib', - 'DEFINES': [ - 'PTW32_STATIC_LIB', - ], 'SOURCES' : [ 'autostatic.c', 'cleanup.c', |