Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1315231 - fix windows build, r=ttaubert
--HG--
extra : rebase_source : 73751cf3c073f95254cfc76f0b3c471ef1e56314
  • Loading branch information
franziskuskiefer committed Dec 9, 2016
1 parent 5d5fedc commit a459832
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build.sh
Expand Up @@ -58,7 +58,7 @@ sancov_default=edge,indirect-calls,8bit-counters

# parse parameters to store in config
params=$(echo "$*" | perl -pe 's/-c|-v|-g|-j [0-9]*|-h//g' | perl -pe 's/^\s*(.*?)\s*$/\1/')
params=$(echo "$params $CC $CCC" | tr " " "\n" | perl -pe '/^\s*$/d')
params=$(echo "$params $CC $CCC" | tr " " "\n" | perl -pe 's/^\s*$//')
params=$(echo "${params[*]}" | sort)

cwd=$(cd $(dirname $0); pwd -P)
Expand Down
2 changes: 1 addition & 1 deletion coreconf/config.gypi
Expand Up @@ -26,7 +26,7 @@
}],
['OS=="win"', {
'use_system_zlib%': 0,
'nspr_libs%': ['nspr4.lib', 'plc4.lib', 'plds4.lib'],
'nspr_libs%': ['libnspr4.lib', 'libplc4.lib', 'libplds4.lib'],
'zlib_libs%': [],
#TODO
'moz_debug_flags%': '',
Expand Down
4 changes: 4 additions & 0 deletions gtests/ssl_gtest/ssl_gtest.gyp
Expand Up @@ -96,8 +96,12 @@
'../../gtests/common',
'../../lib/ssl'
],
'defines': [
'NSS_USE_STATIC_LIBS'
],
},
'variables': {
'module': 'nss',
'use_static_libs': 1,
}
}

0 comments on commit a459832

Please sign in to comment.