Commit e23a946f authored by Ghislain MARY's avatar Ghislain MARY

Inverse the logic of the last commit.

parent 70cb295a
......@@ -116,7 +116,7 @@ else()
set(EP_ffmpeg_TARGET_OS "linux")
set(EP_ffmpeg_PATCH_COMMAND "${PATCH_PROGRAM}" "-p1" "-i" "${CMAKE_CURRENT_SOURCE_DIR}/builders/ffmpeg/no-sdl.patch" ${EP_ffmpeg_PATCH_OPTIONS})
endif()
list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS "--cc=$CC_LAUNCHER")
list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS "--cc=$CC")
endif()
set(EP_ffmpeg_CROSS_COMPILATION_OPTIONS
......
......@@ -132,5 +132,5 @@ else()
"--prefix=${CMAKE_INSTALL_PREFIX}"
"--target=${EP_vpx_TARGET}"
)
set(EP_vpx_CONFIGURE_ENV "LD=$CC")
set(EP_vpx_CONFIGURE_ENV "CC=$CC_NO_LAUNCHER LD=$CC_NO_LAUNCHER")
endif()
......@@ -24,17 +24,17 @@ if("@CMAKE_C_COMPILER_ID@" STREQUAL "GNU")
string(REGEX REPLACE "gcc$" "as" AS_COMPILER "@CMAKE_C_COMPILER@")
set(AUTOTOOLS_AS_COMPILER ${AS_COMPILER} CACHE PATH "Initial cache" FORCE)
endif()
set(AUTOTOOLS_C_COMPILER "@CMAKE_C_COMPILER@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_CXX_COMPILER "@CMAKE_CXX_COMPILER@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_OBJC_COMPILER "@CMAKE_C_COMPILER@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_C_COMPILER "@CMAKE_C_COMPILER_LAUNCHER@ @CMAKE_C_COMPILER@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_CXX_COMPILER "@CMAKE_CXX_COMPILER_LAUNCHER@ @CMAKE_CXX_COMPILER@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_OBJC_COMPILER "@CMAKE_C_COMPILER_LAUNCHER@ @CMAKE_C_COMPILER@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_LINKER "@CMAKE_LINKER@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_AR "@CMAKE_AR@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_RANLIB "@CMAKE_RANLIB@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_STRIP "@CMAKE_STRIP@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_NM "@CMAKE_NM@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_C_COMPILER_LAUNCHER "@CMAKE_C_COMPILER_LAUNCHER@ @CMAKE_C_COMPILER@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_CXX_COMPILER_LAUNCHER "@CMAKE_CXX_COMPILER_LAUNCHER@ @CMAKE_CXX_COMPILER@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_OBJC_COMPILER_LAUNCHER "@CMAKE_C_COMPILER_LAUNCHER@ @CMAKE_C_COMPILER@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_C_COMPILER_NO_LAUNCHER "@CMAKE_C_COMPILER@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_CXX_COMPILER_NO_LAUNCHER "@CMAKE_CXX_COMPILER@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_OBJC_COMPILER_NO_LAUNCHER "@CMAKE_C_COMPILER@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_C_FLAGS "@CMAKE_C_FLAGS@" CACHE STRING "Initial cache" FORCE)
set(AUTOTOOLS_CXX_FLAGS "@CMAKE_CXX_FLAGS@" CACHE STRING "Initial cache" FORCE)
......
......@@ -12,9 +12,9 @@ export AR="@AUTOTOOLS_AR@"
export RANLIB="@AUTOTOOLS_RANLIB@"
export STRIP="@AUTOTOOLS_STRIP@"
export NM="@AUTOTOOLS_NM@"
export CC_LAUNCHER="@AUTOTOOLS_C_COMPILER_LAUNCHER@"
export CXX_LAUNCHER="@AUTOTOOLS_CXX_COMPILER_LAUNCHER@"
export OBJC_LAUNCHER="@AUTOTOOLS_OBJC_COMPILER_LAUNCHER@"
export CC_NO_LAUNCHER="@AUTOTOOLS_C_COMPILER_NO_LAUNCHER@"
export CXX_NO_LAUNCHER="@AUTOTOOLS_CXX_COMPILER_NO_LAUNCHER@"
export OBJC_NO_LAUNCHER="@AUTOTOOLS_OBJC_COMPILER_NO_LAUNCHER@"
ASFLAGS="@ep_asflags@"
CPPFLAGS="@ep_cppflags@"
......
......@@ -12,9 +12,9 @@ export AR="@AUTOTOOLS_AR@"
export RANLIB="@AUTOTOOLS_RANLIB@"
export STRIP="@AUTOTOOLS_STRIP@"
export NM="@AUTOTOOLS_NM@"
export CC_LAUNCHER="@AUTOTOOLS_C_COMPILER_LAUNCHER@"
export CXX_LAUNCHER="@AUTOTOOLS_CXX_COMPILER_LAUNCHER@"
export OBJC_LAUNCHER="@AUTOTOOLS_OBJC_COMPILER_LAUNCHER@"
export CC_NO_LAUNCHER="@AUTOTOOLS_C_COMPILER_NO_LAUNCHER@"
export CXX_NO_LAUNCHER="@AUTOTOOLS_CXX_COMPILER_NO_LAUNCHER@"
export OBJC_NO_LAUNCHER="@AUTOTOOLS_OBJC_COMPILER_NO_LAUNCHER@"
ASFLAGS="@ep_asflags@"
CPPFLAGS="@ep_cppflags@"
......
......@@ -12,9 +12,9 @@ export AR="@AUTOTOOLS_AR@"
export RANLIB="@AUTOTOOLS_RANLIB@"
export STRIP="@AUTOTOOLS_STRIP@"
export NM="@AUTOTOOLS_NM@"
export CC_LAUNCHER="@AUTOTOOLS_C_COMPILER_LAUNCHER@"
export CXX_LAUNCHER="@AUTOTOOLS_CXX_COMPILER_LAUNCHER@"
export OBJC_LAUNCHER="@AUTOTOOLS_OBJC_COMPILER_LAUNCHER@"
export CC_NO_LAUNCHER="@AUTOTOOLS_C_COMPILER_NO_LAUNCHER@"
export CXX_NO_LAUNCHER="@AUTOTOOLS_CXX_COMPILER_NO_LAUNCHER@"
export OBJC_NO_LAUNCHER="@AUTOTOOLS_OBJC_COMPILER_NO_LAUNCHER@"
ASFLAGS="@ep_asflags@"
CPPFLAGS="@ep_cppflags@"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment