diff options
| author | sb <sb@openoffice.org> | 2010-06-22 09:31:32 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-06-22 09:31:32 +0200 |
| commit | 33474c4fff35faaedbd93461acb24496160f820f (patch) | |
| tree | 7fab9f363f39ea2d3a486012b9998dbd2a683716 /cairo | |
| parent | bf6f60cab3d8629c4f2f141143ee18a2c9ef2aa0 (diff) | |
sb126: #i110197# remove -Wl,-z,noexecstack hack
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/cairo/makefile.mk | 2 | ||||
| -rw-r--r-- | cairo/pixman/makefile.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index e0b12cc9f551..564c5dd9995a 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -122,7 +122,7 @@ OUT2INC+=src$/cairo-quartz.h .ELSE # ----------- Unix --------------------------------------------------------- .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ELIF "$(OS)$(COM)"=="SOLARISC52" cairo_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 20773c7597f8..4f8e5ca715aa 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -92,7 +92,7 @@ BUILD_DIR=$(CONFIGURE_DIR) .ELSE # ----------- Unix --------------------------------------------------------- .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" |