From 4088387cf028ea59b21f0f5f86673fb99946400c Mon Sep 17 00:00:00 2001 From: Eric Scharff Date: Fri, 26 Oct 2007 13:32:19 -0600 Subject: [PATCH 1/2] Fix typo in makefile - path must be specified to find --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index 1c9c612b73..7a7df8fdb7 100644 --- a/makefile +++ b/makefile @@ -291,7 +291,7 @@ $(driver-object): $(native-build)/%.o: $(src)/%.cpp $(build)/classpath.jar: $(classpath-classes) (wd=$$(pwd); \ cd $(classpath-build); \ - $(jar) c0f $${wd}/$(@) $$(find -name '*.class')) + $(jar) c0f $${wd}/$(@) $$(find . -name '*.class')) $(classpath-object): $(build)/classpath.jar (wd=$$(pwd); \ From e2ae3201f768efafbd98da25ecec523b8f07eadc Mon Sep 17 00:00:00 2001 From: Eric Scharff Date: Fri, 26 Oct 2007 13:43:14 -0600 Subject: [PATCH 2/2] Fix for mac's lacking objcopy - rely on the version in MacPorts --- makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/makefile b/makefile index 7a7df8fdb7..5b17ba37da 100644 --- a/makefile +++ b/makefile @@ -76,6 +76,7 @@ end-merge-archive = -Wl,--no-whole-archive ifeq ($(platform),darwin) rdynamic = thread-cflags = + objcopy = gobjcopy shared = -dynamiclib pthread = lpthread =