This repository was archived by the owner on Oct 15, 2020. It is now read-only.
File tree 3 files changed +13
-12
lines changed
3 files changed +13
-12
lines changed Original file line number Diff line number Diff line change @@ -353,13 +353,6 @@ if(CLR_CMAKE_PLATFORM_XPLAT)
353
353
add_compile_options (-fno-rtti)
354
354
endif ()
355
355
endif ()
356
-
357
- # Clang -fsanitize.
358
- if (CLANG_SANITIZE_SH)
359
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${CLANG_SANITIZE_SH} " )
360
- set (CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -fsanitize=${CLANG_SANITIZE_SH} " )
361
- unset (CLANG_SANITIZE_SH CACHE ) # don't cache
362
- endif ()
363
356
endif (CLR_CMAKE_PLATFORM_XPLAT)
364
357
365
358
if (ENABLE_FULL_LTO_SH OR ENABLE_THIN_LTO_SH)
@@ -484,6 +477,18 @@ if(ICU_INCLUDE_PATH)
484
477
endif ()
485
478
endif ()
486
479
480
+ # detect features
481
+ include_directories (SYSTEM /usr/local/include )
482
+ include (pal/src/configure.cmake)
483
+
484
+ # this should be after `detect feature` to not to affect feature detection
485
+ # Clang -fsanitize.
486
+ if (CLANG_SANITIZE_SH)
487
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${CLANG_SANITIZE_SH} " )
488
+ set (CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -fsanitize=${CLANG_SANITIZE_SH} " )
489
+ unset (CLANG_SANITIZE_SH CACHE ) # don't cache
490
+ endif ()
491
+
487
492
add_subdirectory (pal)
488
493
489
494
# build the rest with NO_PAL_MINMAX and PAL_STDCPP_COMPAT
Original file line number Diff line number Diff line change 1
1
cmake_minimum_required (VERSION 3.2)
2
2
3
- include_directories (SYSTEM /usr/local/include )
4
-
5
- include (configure.cmake)
6
-
7
3
project (chakrapal)
8
4
9
5
set (CMAKE_INCLUDE_CURRENT_DIR ON )
Original file line number Diff line number Diff line change @@ -1041,4 +1041,4 @@ else() # ANDROID
1041
1041
set (ZH_TW_LOCALE_NAME zh_TW_LOCALE_NOT_FOUND)
1042
1042
set (HAS_FTRUNCATE_LENGTH_ISSUE 0)
1043
1043
endif ()
1044
- configure_file (${CMAKE_CURRENT_SOURCE_DIR} /config.h.in ${CMAKE_CURRENT_BINARY_DIR} /config.h)
1044
+ configure_file (${CMAKE_CURRENT_SOURCE_DIR} /pal/src/ config.h.in ${CMAKE_CURRENT_BINARY_DIR} /pal/src /config.h)
You can’t perform that action at this time.
0 commit comments