diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-07-25 12:07:12 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-25 12:07:12 (GMT) |
| commit | 80eefb3ca14e4ec58d77ed5848f2590d26a96c63 (patch) | |
| tree | 4d360b3e10405582898d92c45d653a635aa1e75e | |
| parent | db35db0076a304536d29979b811983e5fbe42eb6 (diff) | |
| parent | 2e397d24a7ec2e60805a67211dea7481d38f4b2d (diff) | |
| download | mxe-80eefb3ca14e4ec58d77ed5848f2590d26a96c63.zip mxe-80eefb3ca14e4ec58d77ed5848f2590d26a96c63.tar.gz mxe-80eefb3ca14e4ec58d77ed5848f2590d26a96c63.tar.bz2 | |
Merge pull request #1854 from tonytheodore/cmake-isystem
cmake: add option to disable -isystem
| -rw-r--r-- | src/cmake-1-fixes.patch | 27 | ||||
| -rw-r--r-- | src/hyperscan.mk | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/src/cmake-1-fixes.patch b/src/cmake-1-fixes.patch index 59a350b..c6f683a 100644 --- a/src/cmake-1-fixes.patch +++ b/src/cmake-1-fixes.patch @@ -17,3 +17,30 @@ index 1111111..2222222 100644 @@ -1 +1 @@ -set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <DEFINES> <INCLUDES> <FLAGS> <SOURCE> <OBJECT>") +set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <DEFINES> <INCLUDES> <SOURCE> <OBJECT>") + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Tue, 25 Jul 2017 20:34:56 +1000 +Subject: [PATCH] add option to disable -isystem + +taken from (not accepted): +https://gitlab.kitware.com/cmake/cmake/merge_requests/895 + +see also: +https://gitlab.kitware.com/cmake/cmake/issues/16291 +https://gitlab.kitware.com/cmake/cmake/issues/16919 + + +diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake +index 1111111..2222222 100644 +--- a/Modules/Compiler/GNU.cmake ++++ b/Modules/Compiler/GNU.cmake +@@ -42,7 +42,7 @@ macro(__compiler_gnu lang) + string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG") + set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>") + set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>") +- if(NOT APPLE OR NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 4) # work around #4462 ++ if(NOT APPLE OR NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 4 AND (NOT MXE_DISABLE_INCLUDE_SYSTEM_FLAG)) # work around #4462 + set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ") + endif() + endmacro() diff --git a/src/hyperscan.mk b/src/hyperscan.mk index 7e6d696..9180b78 100644 --- a/src/hyperscan.mk +++ b/src/hyperscan.mk @@ -15,6 +15,7 @@ define $(PKG)_BUILD # -DCMAKE_C_FLAGS="-march=core2" -DCMAKE_CXX_FLAGS="-march=core2" cd '$(BUILD_DIR)' && $(TARGET)-cmake \ -DRAGEL='$(PREFIX)/$(BUILD)/bin/ragel' \ + -DMXE_DISABLE_INCLUDE_SYSTEM_FLAG=TRUE \ '$(SOURCE_DIR)' $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MAKE) -C '$(BUILD_DIR)' -j 1 install |