Merge pull request #20110 from johbo/darwin-v8-3-16-14
v8-3_16_14 tweaks for the build on darwin
This commit is contained in:
commit
d10356b825
@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
configurePhase = stdenv.lib.optionalString stdenv.isDarwin ''
|
configurePhase = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||||
ln -s /usr/bin/xcodebuild $TMPDIR
|
ln -s /usr/bin/xcodebuild $TMPDIR
|
||||||
|
ln -s /usr/bin/libtool $TMPDIR
|
||||||
export PATH=$TMPDIR:$PATH
|
export PATH=$TMPDIR:$PATH
|
||||||
'' + ''
|
'' + ''
|
||||||
PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
|
PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
|
||||||
@ -57,8 +58,8 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
install -vD out/Release/d8 "$out/bin/d8"
|
install -vD out/Release/d8 "$out/bin/d8"
|
||||||
${if stdenv.system == "x86_64-darwin" then ''
|
${if stdenv.isDarwin then ''
|
||||||
install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib"
|
install -vD out/Release/libv8.dylib "$out/lib/libv8.dylib"
|
||||||
'' else ''
|
'' else ''
|
||||||
install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so"
|
install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so"
|
||||||
''}
|
''}
|
||||||
|
Loading…
Reference in New Issue
Block a user