diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2024-03-21 14:27:16 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2024-03-21 14:27:29 +0100 |
| commit | b53b2b6e1182efaf532d6eb9377a321e6e13a7e4 (patch) | |
| tree | 044b88b0f711c567162b52f29d5fcc78e443c1f7 | |
| parent | b0b20cdecc34eaec7ff62cb68b0994a7e83780b7 (diff) | |
CMake: Remove "-no-pie" build option
libdecor/build/Makefile: unused anyway (previously used building demos)
src/CMakeLists.txt: broke some user builds, see fltk.general, thread
"-no-pie in FLTK Libraries build." (Mar 17, 2024).
Todo: check usage of "-fPIC" (libdecor builds)
| -rw-r--r-- | libdecor/build/Makefile | 6 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/libdecor/build/Makefile b/libdecor/build/Makefile index c98f12ddb..19cdbb8da 100644 --- a/libdecor/build/Makefile +++ b/libdecor/build/Makefile @@ -1,7 +1,7 @@ # # Library Makefile for the Fast Light Tool Kit (FLTK). # -# Copyright 2022-2023 by Bill Spitzak and others. +# Copyright 2022-2024 by Bill Spitzak and others. # # This library is free software. Distribution and use rights are outlined in # the file "COPYING" which should have been included with this file. If this @@ -29,10 +29,6 @@ EXTRA_DECOR = ${${UNAME}_CFLAGS} CFLAGS_DECOR = -I. -I../.. -I../../src -I../src -I../src/plugins $(EXTRA_DECOR) -fPIC -D_GNU_SOURCE \ -DHAVE_MEMFD_CREATE -DHAVE_MKOSTEMP -DHAVE_POSIX_FALLOCATE -Linux_NOPIE = -no-pie -FreeBSD_NOPIE = -NOPIE = ${${UNAME}_NOPIE} - all : $(OBJECTS) depend: diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 062078ef6..58954c2ca 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -765,9 +765,6 @@ if(UNIX AND FLTK_BACKEND_WAYLAND) if(DBUS_FOUND) list(APPEND OPTIONAL_LIBS "${DBUS_LDFLAGS}") endif(DBUS_FOUND) - if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND NOT FLTK_BUILD_SHARED_LIBS) - list(APPEND OPTIONAL_LIBS "-no-pie") - endif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND NOT FLTK_BUILD_SHARED_LIBS) endif(UNIX AND FLTK_BACKEND_WAYLAND) ####################################################################### |