diff options
| author | Lenny Komow <lenny@lunarg.com> | 2018-01-15 14:56:08 -0700 |
|---|---|---|
| committer | Mike Weiblen <mikew@lunarg.com> | 2018-01-16 11:28:24 -0700 |
| commit | 67a30bd74801b4d18ec40a8f001fdd0b3bd79375 (patch) | |
| tree | c3b32a2902d577fadccd1272cf572ade68ed4cc6 /loader | |
| parent | 5ee3c3dfc4ce3f42fcd4355f5697598138b927e7 (diff) | |
| download | usermoji-67a30bd74801b4d18ec40a8f001fdd0b3bd79375.tar.xz | |
build: Fix linux 32-bit assembly config
This fixes a bug whereby 32-bit Linux builds would not be able to
use the assembly code as the try_compile command would fail when it
attempted to link with compiler flags
Change-Id: I6e4479fb7926169a7fa5c01876834cdae8c3b637
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index a2a70eba..e5334c4b 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -111,13 +111,14 @@ if (WIN32) endif() else() enable_language(ASM-ATT) - set(CMAKE_ASM-ATT_FLAGS "${CMAKE_ASM-ATT_FLAGS} $ENV{ASFLAGS}") - set(CMAKE_ASM-ATT_FLAGS "${CMAKE_ASM-ATT_FLAGS} -I\"${CMAKE_CURRENT_BINARY_DIR}\"") + set(CMAKE_ASM-ATT_COMPILE_FLAGS "${CMAKE_ASM-ATT_COMPILE_FLAGS} $ENV{ASFLAGS}") + set(CMAKE_ASM-ATT_COMPILE_FLAGS "${CMAKE_ASM-ATT_COMPILE_FLAGS} -I\"${CMAKE_CURRENT_BINARY_DIR}\"") file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/asm_test.asm ".intel_syntax noprefix\n.text\n.global sample\nsample:\nmov ecx, [eax + 16]\n") try_compile(ASSEMBLER_WORKS ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/asm_test.asm) file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/asm_test.asm) if (ASSEMBLER_WORKS) + set(CMAKE_ASM-ATT_FLAGS "$ENV{ASFLAGS} -I\"${CMAKE_CURRENT_BINARY_DIR}\"") set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} unknown_ext_chain_gas.asm) add_executable(asm_offset asm_offset.c) add_dependencies(asm_offset generate_helper_files loader_gen_files) |