Fix cross-compiling by replacing hardcoded -L/usr/X11R6/lib
Bug #193062 r=peterl a=asa git-svn-id: svn://10.0.0.236/trunk@137779 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -43,7 +43,7 @@ include $(topsrcdir)/config/rules.mk
|
||||
|
||||
DEFINES += -DMOZILLA_STRICT_API
|
||||
|
||||
EXTRA_DSO_LDOPTS += -L/usr/lib -L/usr/X11R6/lib -rdynamic -lXi -lXext -lX11 -lm -lXt
|
||||
EXTRA_DSO_LDOPTS += $(XLDFLAGS) -rdynamic -lXi -lXext -lX11 -lm -lXt
|
||||
|
||||
INSTALL_PLUGIN = $(CONFIG_TOOLS)/nsinstall -R
|
||||
INSTALL = true
|
||||
|
||||
@@ -46,7 +46,7 @@ include $(topsrcdir)/config/rules.mk
|
||||
|
||||
DEFINES += -DMOZILLA_STRICT_API
|
||||
|
||||
EXTRA_DSO_LDOPTS += -L/usr/lib -L/usr/X11R6/lib -rdynamic -lXi -lXext -lX11 -lm -lXt
|
||||
EXTRA_DSO_LDOPTS += $(XLDFLAGS) -rdynamic -lXi -lXext -lX11 -lm -lXt
|
||||
|
||||
INSTALL_PLUGIN = $(CONFIG_TOOLS)/nsinstall -R
|
||||
INSTALL = true
|
||||
|
||||
@@ -53,7 +53,7 @@ include $(topsrcdir)/config/rules.mk
|
||||
DEFINES += -DMOZILLA_STRICT_API
|
||||
|
||||
ifeq ($(OS_ARCH),Linux)
|
||||
EXTRA_DSO_LDOPTS += -L/usr/lib -L/usr/X11R6/lib -rdynamic -lXi -lXext -lX11 -lm -lXt
|
||||
EXTRA_DSO_LDOPTS += $(XLDFLAGS) -rdynamic -lXi -lXext -lX11 -lm -lXt
|
||||
endif
|
||||
|
||||
LOCAL_INCLUDES = -I./$(XPIDL_GEN_DIR) \
|
||||
|
||||
Reference in New Issue
Block a user