diff options
| author | Xusheng <xusheng@vector35.com> | 2021-08-05 11:48:25 +0800 |
|---|---|---|
| committer | Xusheng <xusheng@vector35.com> | 2021-08-05 13:57:29 +0800 |
| commit | a5a34fe70a2130a9bdd82eeaa31d427f607b3022 (patch) | |
| tree | fa0f0b8bd2033a0214c6ea1f250e780b05b2e0f7 | |
| parent | b78c9f4f4a53a77ea7267b61e7d90ea7778400df (diff) | |
Correctly detect if the current build is executed on the build server
| -rw-r--r-- | rust/binaryninjacore-sys/build.rs | 9 | ||||
| -rw-r--r-- | rust/examples/basic_script/CMakeLists.txt | 10 |
2 files changed, 11 insertions, 8 deletions
diff --git a/rust/binaryninjacore-sys/build.rs b/rust/binaryninjacore-sys/build.rs index 13de448f..bbecc88c 100644 --- a/rust/binaryninjacore-sys/build.rs +++ b/rust/binaryninjacore-sys/build.rs @@ -117,10 +117,13 @@ fn main() { let llvm_dir = env::var("LIBCLANG_PATH"); let llvm_version = env::var("LLVM_VERSION"); let llvm_install_dir = env::var("LLVM_INSTALL_DIR"); + let build_server = env::var("BUILD_SERVER"); - if let (Ok(llvm_dir), Ok(llvm_version)) = (llvm_dir, llvm_version) { - let llvm_include_path = format!("-I{}/clang/{}/include", llvm_dir, llvm_version); - bindings = bindings.clang_arg(llvm_include_path); + if let (Ok(llvm_dir), Ok(llvm_version), Ok(build_server)) = (llvm_dir, llvm_version, build_server) { + if build_server == "ON" { + let llvm_include_path = format!("-I{}/clang/{}/include", llvm_dir, llvm_version); + bindings = bindings.clang_arg(llvm_include_path); + } } else if let Ok(llvm_install_dir) = llvm_install_dir { let llvm_include_path = format!("-I{}/12.0.0/lib/clang/12.0.0/include", llvm_install_dir); diff --git a/rust/examples/basic_script/CMakeLists.txt b/rust/examples/basic_script/CMakeLists.txt index e9796cd9..3156595f 100644 --- a/rust/examples/basic_script/CMakeLists.txt +++ b/rust/examples/basic_script/CMakeLists.txt @@ -45,10 +45,10 @@ if(APPLE) OUTPUT ${OUTPUT_PATH} COMMAND ${CMAKE_COMMAND} -E env MACOSX_DEPLOYMENT_TARGET=10.14 LIBCLANG_PATH=${LLVM_PATH}/lib LLVM_VERSION=${LLVM_VERSION} BINARYNINJADIR=${BN_CORE_OUTPUT_DIR} - ${RUSTUP_COMMAND} --target=aarch64-apple-darwin ${CARGO_OPTS} + BUILD_SERVER=${BUILD_SERVER} ${RUSTUP_COMMAND} --target=aarch64-apple-darwin ${CARGO_OPTS} COMMAND ${CMAKE_COMMAND} -E env MACOSX_DEPLOYMENT_TARGET=10.14 LIBCLANG_PATH=${LLVM_PATH}/lib LLVM_VERSION=${LLVM_VERSION} BINARYNINJADIR=${BN_CORE_OUTPUT_DIR} - ${RUSTUP_COMMAND} --target=x86_64-apple-darwin ${CARGO_OPTS} + BUILD_SERVER=${BUILD_SERVER} ${RUSTUP_COMMAND} --target=x86_64-apple-darwin ${CARGO_OPTS} COMMAND cp ${AARCH64_LIB_PATH} ${OUTPUT_PATH}-aarch COMMAND cp ${X86_64_LIB_PATH} ${OUTPUT_PATH} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} @@ -64,7 +64,7 @@ if(APPLE) OUTPUT ${OUTPUT_PATH} COMMAND ${CMAKE_COMMAND} -E env MACOSX_DEPLOYMENT_TARGET=10.14 LIBCLANG_PATH=${LLVM_PATH}/lib LLVM_VERSION=${LLVM_VERSION} BINARYNINJADIR=${BN_CORE_OUTPUT_DIR} - ${RUSTUP_COMMAND} ${CARGO_OPTS} + BUILD_SERVER=${BUILD_SERVER} ${RUSTUP_COMMAND} ${CARGO_OPTS} COMMAND cp ${LIB_PATH} ${OUTPUT_PATH} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES}) @@ -74,7 +74,7 @@ elseif(WIN32) OUTPUT ${OUTPUT_PATH} COMMAND ${CMAKE_COMMAND} -E env LIBCLANG_PATH=${LLVM_PATH}/lib LLVM_VERSION=${LLVM_VERSION} BINARYNINJADIR=${BN_CORE_OUTPUT_DIR} - ${RUSTUP_COMMAND} ${CARGO_OPTS} + BUILD_SERVER=${BUILD_SERVER} ${RUSTUP_COMMAND} ${CARGO_OPTS} COMMAND cp ${TARGET_DIR}/${OUTPUT_FILE} ${OUTPUT_PATH} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES}) @@ -83,7 +83,7 @@ else() OUTPUT ${OUTPUT_PATH} COMMAND ${CMAKE_COMMAND} -E env LIBCLANG_PATH=${LLVM_PATH}/lib LLVM_VERSION=${LLVM_VERSION} BINARYNINJADIR=${BN_CORE_OUTPUT_DIR} - ${RUSTUP_COMMAND} ${CARGO_OPTS} + BUILD_SERVER=${BUILD_SERVER} ${RUSTUP_COMMAND} ${CARGO_OPTS} COMMAND cp ${TARGET_DIR}/${OUTPUT_FILE} ${OUTPUT_PATH} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES}) |