Skip to content

Commit

Permalink
debug CXX
Browse files Browse the repository at this point in the history
Signed-off-by: Larry Gritz <[email protected]>
  • Loading branch information
lgritz committed Jan 12, 2025
1 parent 64feb96 commit b2289f9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/build-scripts/build_openimageio.bash
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ echo "Building OpenImageIO ${OPENIMAGEIO_VERSION}"
echo "OpenImageIO build dir will be: ${OPENIMAGEIO_BUILD_DIR}"
echo "OpenImageIO install dir will be: ${OPENIMAGEIO_INSTALL_DIR}"
echo "OpenImageIO Build type is ${OPENIMAGEIO_BUILD_TYPE}"
echo "CXX: '${CXX}'"
echo "CC: '${CC}'"
echo "CMAKE_CXX_COMPILER: '${CMAKE_CXX_COMPILER}'"

if [ ! -e $OPENIMAGEIO_SOURCE_DIR ] ; then
Expand Down
1 change: 1 addition & 0 deletions src/build-scripts/ci-startup.bash
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ if [[ `uname -s` == "Linux" ]] ; then
export CC=${CC:=gcc}
export CXX=${CXX:=g++}
fi
echo "CI-startup: CC=$CC, CXX=$CXX"
export OSL_CI=true
export USE_NINJA=${USE_NINJA:=1}
if [[ "${RUNNER_OS}" != "Windows" ]] ; then
Expand Down
8 changes: 8 additions & 0 deletions src/build-scripts/gh-win-installdeps.bash
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
# SPDX-License-Identifier: BSD-3-Clause
# https://github.com/AcademySoftwareFoundation/OpenShadingLanguage

echo "gh-win-installdeps.bash"
env | sort

# DEP_DIR="$PWD/ext/dist"
DEP_DIR="$PWD/dist"
mkdir -p "$DEP_DIR"
Expand Down Expand Up @@ -89,6 +92,7 @@ export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH:$VCPKG_INSTALLATION_ROOT/installed/
#
echo "All VCPkg installs:"
vcpkg list
echo "CHECKPOINT 10: CXX=$CXX, CC=$CC"
#
########################################################################

Expand Down Expand Up @@ -123,6 +127,7 @@ export pybind11_ROOT=$PWD/ext/dist
# FFmpeg_ROOT=$PWD/ffmpeg-4.2.1-win64-dev

echo "CMAKE_PREFIX_PATH = $CMAKE_PREFIX_PATH"
echo "CHECKPOINT 20: CXX=$CXX, CC=$CC"

# if [[ "$OPENEXR_VERSION" != "" ]] ; then
# OPENEXR_CXX_FLAGS=" /W1 /EHsc /DWIN32=1 "
Expand Down Expand Up @@ -150,6 +155,7 @@ fi
cp $DEP_DIR/lib/*.lib $DEP_DIR/bin || true
cp $DEP_DIR/bin/*.dll $DEP_DIR/lib || true

echo "CHECKPOINT 30: CXX=$CXX, CC=$CC"

if [[ "$OPENIMAGEIO_VERSION" != "" ]] ; then
# There are many parts of OIIO we don't need to build for OSL's tests
Expand All @@ -172,6 +178,8 @@ if [[ "$OPENIMAGEIO_VERSION" != "" ]] ; then
# only a savings in CI where there are only 1-2 cores available.)
export OPENIMAGEIO_CMAKE_FLAGS+=" -DCMAKE_UNITY_BUILD=ON -DCMAKE_UNITY_BUILD_MODE=BATCH"
fi
export OPENIMAGEIO_CMAKE_FLAGS+=" -DCMAKE_CXX_COMPILER=\"$CXX\""
export OPENIMAGEIO_CMAKE_FLAGS+=" -DCMAKE_CC_COMPILER=\"$CC\""
source src/build-scripts/build_openimageio.bash
fi

Expand Down

0 comments on commit b2289f9

Please sign in to comment.