Advertisement
TeLLie

Untitled

Nov 30th, 2016
105
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.66 KB | None | 0 0
  1. diff -ur cmake-3.4.1-o/bootstrap cmake-3.4.1/bootstrap
  2. --- cmake-3.4.1-o/bootstrap 2015-12-03 02:13:24.000000000 +1030
  3. +++ cmake-3.4.1/bootstrap 2016-01-04 18:50:10.000000000 +1030
  4. @@ -92,6 +92,13 @@
  5. cmake_system_mingw=false
  6. fi
  7.  
  8. +# Determine whether this is a OS/2 environment.
  9. +if echo "${cmake_system}" | grep OS/2 >/dev/null 2>&1; then
  10. + cmake_system_os2=true
  11. +else
  12. + cmake_system_os2=false
  13. +fi
  14. +
  15. # Determine whether this is OS X
  16. if echo "${cmake_system}" | grep Darwin >/dev/null 2>&1; then
  17. cmake_system_darwin=true
  18. @@ -543,7 +550,7 @@
  19. cmake_try_run ()
  20. {
  21. COMPILER=$1
  22. - FLAGS=$2
  23. + FLAGS=$2
  24. TESTFILE=$3
  25. if [ ! -f "${TESTFILE}" ]; then
  26. echo "Test file ${TESTFILE} missing. Please verify your CMake source tree."
  27. @@ -555,7 +562,7 @@
  28. echo "---------- file -----------------------"
  29. cat "${TESTFILE}"
  30. echo "------------------------------------------"
  31. - "${COMPILER}" ${FLAGS} "${TESTFILE}" -o "${TMPFILE}"
  32. + "${COMPILER}" ${cmake_ld_flags} ${FLAGS} "${TESTFILE}" -o "${TMPFILE}"
  33. RES=$?
  34. if [ "${RES}" -ne "0" ]; then
  35. echo "Test failed to compile"
  36. @@ -729,6 +736,11 @@
  37. cmake_ld_flags="${LDFLAGS} -Wl,--enable-auto-import"
  38. fi
  39.  
  40. +# Add OS/2 flags
  41. +if ${cmake_system_os2}; then
  42. + cmake_ld_flags="${LDFLAGS} -Zexe"
  43. +fi
  44. +
  45. # Add CoreFoundation framework on Darwin
  46. if ${cmake_system_darwin}; then
  47. cmake_ld_flags="${LDFLAGS} -framework CoreFoundation"
  48. @@ -936,7 +948,7 @@
  49. else
  50. cmake_make_processors="${CMAKE_KNOWN_MAKE_PROCESSORS}"
  51. fi
  52. -
  53. +cmake_make_processor="make.exe"
  54. TMPFILE="`cmake_tmp_file`_dir"
  55. rm -rf "${cmake_bootstrap_dir}/${TMPFILE}"
  56. mkdir "${cmake_bootstrap_dir}/${TMPFILE}"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement