Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[do not review] fix: remove explicit CXX from reflex third party #4595

Closed
wants to merge 13 commits into from
19 changes: 15 additions & 4 deletions .github/workflows/daily-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,26 @@ jobs:
- name: Configure & Build
run: |
cd $GITHUB_WORKSPACE/build

export PATH=/usr/local/opt/bison/bin:$PATH
gcc-12 --version

# We need -isysroot such that we fetch both include and lib dirs for standard library
# On macos-15 /usr/bin/cc or /usr/bin/clang does this automatically. However for macos-13 it seems that this is not the case.
# Furthermore, keep in mind that on macos-15, /Applications/Xcode.app/... have been moved to /Library/Developer
# so if we upgrade this flow to use a newer version this might fail.
export CPPFLAGS="-isysroot $(xcrun --sdk macosx --show-sdk-path)"
export CCFLAGS="-isysroot $(xcrun --sdk macosx --show-sdk-path)"
#ls -lah /Library/Developer/CommandLineTools/usr/bin/clang

#echo "next ls"

#ls -lah /Library/Developer/


bison --version

echo "*************************** START BUILDING **************************************"
CC=gcc-12 CXX=g++-12 cmake .. -DCMAKE_BUILD_TYPE=Debug -GNinja -DWITH_UNWIND=OFF \
-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_FLAGS="-Wl,-ld_classic"
CC=/usr/bin/clang CXX=/usr/bin/clang++ cmake .. -DCMAKE_BUILD_TYPE=Debug -GNinja -DWITH_UNWIND=OFF \
-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_FLAGS="-Wl"

ninja src/all

Expand Down
1 change: 0 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ add_third_party(
URL https://github.com/Genivia/RE-flex/archive/refs/tags/v5.2.2.tar.gz
PATCH_COMMAND autoreconf -fi
CONFIGURE_COMMAND <SOURCE_DIR>/configure --disable-avx2 --prefix=${THIRD_PARTY_LIB_DIR}/reflex
CXX=${CMAKE_CXX_COMPILER} CC=${CMAKE_C_COMPILER}
)

set(REFLEX "${THIRD_PARTY_LIB_DIR}/reflex/bin/reflex")
Expand Down
Loading