summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Modules/CMakeTestCCompiler.cmake9
-rwxr-xr-xbootstrap16
2 files changed, 13 insertions, 12 deletions
diff --git a/Modules/CMakeTestCCompiler.cmake b/Modules/CMakeTestCCompiler.cmake
index 9b9a51a..639baee 100644
--- a/Modules/CMakeTestCCompiler.cmake
+++ b/Modules/CMakeTestCCompiler.cmake
@@ -11,7 +11,14 @@ IF(NOT CMAKE_C_COMPILER_WORKS)
"# error \"The CMAKE_C_COMPILER is set to a C++ compiler\"\n"
"#endif\n"
"#include <stdio.h>\n"
- "int main(int argc, char* argv[]){ printf(\"%s\\n\", argv[0]); return argc-1;}\n")
+ "#if defined(__CLASSIC_C__)\n"
+ "int main(argc, argv)\n"
+ " int argc;\n"
+ " char* argv[];\n"
+ "#else\n"
+ "int main(int argc, char* argv[])\n"
+ "#endif\n"
+ "{ printf(\"%s\\n\", argv[0]); return argc-1;}\n")
TRY_COMPILE(CMAKE_C_COMPILER_WORKS ${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCCompiler.c
OUTPUT_VARIABLE OUTPUT)
diff --git a/bootstrap b/bootstrap
index 047f0f1..d6331df 100755
--- a/bootstrap
+++ b/bootstrap
@@ -536,19 +536,13 @@ fi
# Check if C compiler works
TMPFILE=`cmake_tmp_file`
cat > "${TMPFILE}.c" <<EOF
-#include<stdio.h>
-#if defined(__hpux) && !defined(__GNUC__)
-# if defined(__CLASSIC_C__)
-/* No ansi option given. */
-# define bootstrap_require_no_prototype
-# elif defined(__STDC_EXT__)
-/* Option -Ae given. */
-# else
-/* Option -Aa given. */
-# endif
+#ifdef __cplusplus
+# error "The CMAKE_C_COMPILER is set to a C++ compiler"
#endif
-#ifdef bootstrap_require_no_prototype
+#include<stdio.h>
+
+#if defined(__CLASSIC_C__)
int main(argc, argv)
int argc;
char* argv[];