From 25dff099078d6923172100372268035488d6c08e Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Sun, 12 Jun 2011 21:00:47 +0200 Subject: tell the linker how to resolve @loader_path on Mac also cleanup useless double checking for MACOSX and remove unneeded AUGMENT_LIBRARY_PATH --- libcroco/makefile.mk | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'libcroco') diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk index 9e26dded174f..4789c0795897 100644 --- a/libcroco/makefile.mk +++ b/libcroco/makefile.mk @@ -51,17 +51,14 @@ PATCH_FILES= CONFIGURE_DIR= .IF "$(OS)"=="MACOSX" -CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ - ./configure \ - --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \ +CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \ + CPPFLAGS="$(EXTRA_CDEFS)" \ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \ - LDFLAGS="-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL))" \ + LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) -Wl,-dylib_file,@loader_path/libgmodule-2.0.0.dylib:$(SOLARLIBDIR)/libgmodule-2.0.0.dylib" \ GLIB2_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \ GLIB2_LIBS="-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \ LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)" -CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) - .IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF -- cgit