From 9520fcb554126f4ee0573913f60ed6b992e49b56 Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Mon, 8 Jul 2013 18:40:44 -0600 Subject: [PATCH] Fix link flags so relative paths aren't propagated. --- Makefile.in | 3 ++- ll.rs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 23b01d2..5711397 100644 --- a/Makefile.in +++ b/Makefile.in @@ -5,7 +5,8 @@ CXX ?= g++ CXXFLAGS ?= AR ?= ar RUSTC ?= rustc -RUSTFLAGS ?= +RUSTFLAGS += -L . -L ../libcss -L ../../libparserutils/libparserutils -L ../../wapcaplet/libwapcaplet + RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs') diff --git a/ll.rs b/ll.rs index 96118dd..e0c56ec 100644 --- a/ll.rs +++ b/ll.rs @@ -18,12 +18,12 @@ use std::libc::types::common::c99::uint32_t; #[cfg(target_os = "macos")] #[nolink] -#[link_args="-L../../netsurfcss/libcss -lcss -L../../libparserutils/libparserutils -lparserutils -L../../wapcaplet/libwapcaplet -lwapcaplet -liconv"] +#[link_args="-lcss -lparserutils -lwapcaplet -liconv"] extern { } #[cfg(target_os = "linux")] #[nolink] -#[link_args="-L../../netsurfcss/libcss -lcss -L../../libparserutils/libparserutils -lparserutils -L../../wapcaplet/libwapcaplet -lwapcaplet"] +#[link_args="-lcss -lparserutils -lwapcaplet"] extern { } // Generally true