diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-09-14 12:31:24 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-09-14 12:31:24 +0200 |
| commit | 8f44f0d5f0b56226fc5bee4fcae8a1c7cc143aa8 (patch) | |
| tree | e578b4fedaddebccf22b992f629fad4d611df732 /cairo | |
| parent | 399cb3be848ab06592cf5eb6951787701b2b801d (diff) | |
cairo-cairo-makefile-mk.diff: Fix linking of internal cairo library
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/cairo/makefile.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index a29012892576..88953d03b46c 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -120,7 +120,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,-z,noexecstack .ELIF "$(OS)$(COM)"=="SOLARISC52" cairo_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" @@ -169,6 +169,11 @@ OUT2INC+=src$/cairo-xlib.h \ CONFIGURE_FLAGS+=pixman_CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc" pixman_LIBS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib -lpixman-1" .ENDIF +.IF "$(debug)"!="" +cairo_CFLAGS+=-g +CONFIGURE_FLAGS+= STRIP=" " +.ENDIF + CONFIGURE_FLAGS+=CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc $(cairo_CFLAGS)" LDFLAGS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib $(cairo_LDFLAGS)" CPPFLAGS="$(cairo_CPPFLAGS)" .ENDIF |