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.

Sign up for GitHub

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

Jump to bottom

adjusted CMake to new cctools setup #86

Merged
merged 3 commits into from
Nov 22, 2023
Merged

adjusted CMake to new cctools setup #86

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
126512f
minor fixes needed to work with the streamlined cctools
sbscholz Nov 21, 2023
f8c4d3b
changed all c-modules to sac2c -cc ccrmod
sbscholz Nov 21, 2023
120741f
forgot to remove old comment
sbscholz Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ MACRO (CHECK_SAC2C_CC_FLAG flag var)
# Call CC via sac2c
EXECUTE_PROCESS (
COMMAND
${SAC2C_T} ${__werror} ${__flag} -noprelude -cc ccmod
${SAC2C_T} ${__werror} ${__flag} -noprelude -cc ccrmod
"${CMAKE_BINARY_DIR}/test-${FLAG}.c"
-o "${CMAKE_BINARY_DIR}/test-${FLAG}"
ERROR_VARIABLE sac2c_exec_error
Expand Down Expand Up @@ -99,7 +99,7 @@ ADD_CUSTOM_COMMAND (
${SAC2C} -Xc -I${CMAKE_CURRENT_SOURCE_DIR}/${LEX_BIS_DIR}
-Xc -I${CMAKE_CURRENT_BINARY_DIR}/${LEX_BIS_DIR}
${FLEX_SAC2C_CC_FLAGS}
-v0 -noprelude -cc ccmod
-v0 -noprelude -cc ccrmod
-o "${CMAKE_CURRENT_BINARY_DIR}/stdio/src/FibreIO/lex.FibreScan.o"
"${LEX_OUT}"
WORKING_DIRECTORY
Expand All @@ -115,7 +115,7 @@ ADD_CUSTOM_COMMAND (
${SAC2C} -Xc -I${CMAKE_CURRENT_SOURCE_DIR}/${LEX_BIS_DIR}
-Xc -I${CMAKE_CURRENT_BINARY_DIR}/${LEX_BIS_DIR}
${BISON_SAC2C_CC_FLAGS}
-v0 -noprelude -cc ccmod
-v0 -noprelude -cc ccrmod
-o "${CMAKE_CURRENT_BINARY_DIR}/stdio/src/FibreIO/FibreScan.tab.o"
"${BIS_OUTC}"
WORKING_DIRECTORY
Expand Down Expand Up @@ -366,9 +366,9 @@ FOREACH (name ${C_DEPS_SRC})
IMPLICIT_DEPENDS C "${src}"
DEPENDS "$<$<NOT:$<EQUAL:-1,${_is_fibreio}>>:${BIS_OUTH}>"
COMMAND
${SAC2C} -Xc -I${CMAKE_CURRENT_SOURCE_DIR}/${dir}
-Xc -I${CMAKE_CURRENT_BINARY_DIR}/${dir}
-v0 -noprelude -cc ccmod -o "${dst}" "${src}"
${SAC2C} -Xp -I${CMAKE_CURRENT_SOURCE_DIR}/${dir}
-Xp -I${CMAKE_CURRENT_BINARY_DIR}/${dir}
-v0 -noprelude -cc ccrmod -o "${dst}" "${src}"
WORKING_DIRECTORY
"${CMAKE_CURRENT_BINARY_DIR}/${dir}"
COMMENT "Generating ${dst} for target `${TARGET}'"
Expand Down Expand Up @@ -497,10 +497,9 @@ FOREACH (name ${XSAC_SRC})

ADD_CUSTOM_COMMAND (
OUTPUT "${dir}/${dst}.sac"
# FIXME it would be better to call saccc like it is done currently
# $(SACCC) $(SAC2C) prog seq -E "-x c" -I. $(DEFS)
COMMAND
${SAC2C} -cc ccprog -Xc -E -Xc "-x c" -noprelude -o /dev/stdout "${src}" > "${dir}/${dst}.sac"
# sac2c calls the preprocessor and the '-cppI's are there anyways!
cp "${src}" "${dir}/${dst}.sac" # sac2c calls the preprocessor and the
sbscholz marked this conversation as resolved.
Show resolved Hide resolved
WORKING_DIRECTORY
"${dir}"
DEPENDS "${src}"
Expand Down
Loading