Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

geckolib: Don't hardcode library paths

Browse source 
It feels like a hack but it's supposed to work in any clang...
This commit is contained in:
Emilio Cobos Álvarez 2016-03-05 01:29:52 +01:00
parent 0128e985f6
commit 38b30c6490
2 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ports/geckolib/tools/regen_style_structs.sh
View file

@ -15,17 +15,22 @@ if [ ! -d rust-bindgen ]; then
fi fi
# Need to find a way to avoid hardcoding these # Need to find a way to avoid hardcoding these
STD_LIB_PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include
STDXX_LIB_PATH=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1
if [ ! -d $STD_LIB_PATH ] || [ ! -d $STDXX_LIB_PATH ]; then
echo "Please update the above environmental variables to point to your standard library."
exit 1
fi
export RUST_BACKTRACE=1 export RUST_BACKTRACE=1
export LIBCLANG_PATH=`pwd`/llvm/build/Release+Asserts/lib export LIBCLANG_PATH=`pwd`/llvm/build/Release+Asserts/lib
export DYLD_LIBRARY_PATH=`pwd`/llvm/build/Release+Asserts/lib export DYLD_LIBRARY_PATH=`pwd`/llvm/build/Release+Asserts/lib
export LD_LIBRARY_PATH=`pwd`/llvm/build/Release+Asserts/lib
export DIST_INCLUDE=$1/dist/include export DIST_INCLUDE=$1/dist/include
CLANG_SEARCH_DIRS=$(clang++ -print-search-dirs | grep 'libraries: ' | cut -d = -f 2)
CLANG_SEARCH_DIRS=$(clang++ -E -x c++ - -v < /dev/null 2>&1 | awk '{ \
if ($0 == "#include <...> search starts here:") \
in_headers = 1; \
else if ($0 == "End of search list.") \
in_headers = 0; \
else if (in_headers == 1) { \
gsub(/^[ \t]+/, "", $0); \
printf " -isystem %s", $0; \
}
}' | sed -e s/:$//g)
# Check for the include directory. # Check for the include directory.
if [ ! -d $DIST_INCLUDE ]; then if [ ! -d $DIST_INCLUDE ]; then
@ -38,4 +43,7 @@ fi
# library in DYLD_LIBRARY_PATH. # library in DYLD_LIBRARY_PATH.
# #
# /Applications/Xcode.app/Contents/Developer/usr/bin/lldb -- # /Applications/Xcode.app/Contents/Developer/usr/bin/lldb --
./rust-bindgen/target/debug/bindgen -x c++ -std=gnu++0x -ignore-functions -allow-unknown-types -isystem $STDXX_LIB_PATH -isystem $STD_LIB_PATH -I$DIST_INCLUDE -I$DIST_INCLUDE/nspr -DDEBUG=1 -DTRACING=1 -DOS_POSIX=1 -DOS_MACOSX=1 -DMOZILLA_INTERNAL_API -DIMPL_LIBXUL -include $1/mozilla-config.h -o ../gecko_style_structs.rs $DIST_INCLUDE/nsStyleStruct.h ./rust-bindgen/target/debug/bindgen -x c++ -std=gnu++0x -ignore-functions -allow-unknown-types \
$CLANG_SEARCH_DIRS \
-I$DIST_INCLUDE -I$DIST_INCLUDE/nspr -DDEBUG=1 -DTRACING=1 -DOS_POSIX=1 -DOS_MACOSX=1 -DMOZILLA_INTERNAL_API -DIMPL_LIBXUL \
-include $1/mozilla-config.h -o ../gecko_style_structs.rs $DIST_INCLUDE/nsStyleStruct.h

18
ports/geckolib/tools/setup_bindgen.sh
View file

@ -9,12 +9,6 @@ if [ ! -d llvm ]; then
exit 1 exit 1
fi fi
# Don't run twice.
if [ -d rust-bindgen ]; then
echo "rust-bindgen directory already exists."
exit 1
fi
# Check for multirust # Check for multirust
if [ ! -x "$(command -v multirust)" ]; then if [ ! -x "$(command -v multirust)" ]; then
echo 'multirust must be installed.' echo 'multirust must be installed.'
@ -23,8 +17,14 @@ fi
# Setup and build bindgen. # Setup and build bindgen.
export LIBCLANG_PATH=`pwd`/llvm/build/Release+Asserts/lib export LIBCLANG_PATH=`pwd`/llvm/build/Release+Asserts/lib
git clone https://github.com/bholley/rust-bindgen.git # Don't run twice.
cd rust-bindgen if [ ! -d rust-bindgen ]; then
git checkout sm-hacks git clone https://github.com/bholley/rust-bindgen.git
cd rust-bindgen
git checkout sm-hacks
else
cd rust-bindgen
fi
multirust override nightly multirust override nightly
cargo build cargo build